@shuvi/platform-shared 1.0.0-rc.1 → 1.0.0-rc.12

package/lib/node/route/route.js

@@ -13,8 +13,10 @@ exports.getMiddlewareRoutes = exports.getApiRoutes = exports.getPageRoutes = exp
 const path_1 = require("path");
 const file_1 = require("@shuvi/utils/lib/file");
 const helpers_1 = require("./helpers");
-const getRawRoutesFromDir = (dirname) => __awaiter(void 0, void 0, void 0, function* () {
-    if (!(yield (0, file_1.isDirectory)(dirname))) {
+const matchSpec_1 = require("./matchSpec");
+const getRawRoutesFromDir = (dirname, excludes) => __awaiter(void 0, void 0, void 0, function* () {
+    const rootDirname = dirname;
+    if (!(yield (0, file_1.isDirectory)(rootDirname))) {
         return {
             routes: [],
             warnings: [],
@@ -23,7 +25,9 @@ const getRawRoutesFromDir = (dirname) => __awaiter(void 0, void 0, void 0, funct
     }
     const warnings = [];
     const errors = [];
-    const _getRawRoutesFromDir = (dirname, rawRoutes, segment) => __awaiter(void 0, void 0, void 0, function* () {
+    const routes = [];
+    const patterns = (0, matchSpec_1.getFileMatcherPatterns)(rootDirname, excludes);
+    const visitDirectory = (dirname, routes, parentDir) => __awaiter(void 0, void 0, void 0, function* () {
         const files = yield (0, helpers_1.getAllowFilesAndDirs)(dirname);
         const onlyHasDir = !(0, helpers_1.hasAllowFiles)(files);
         if (!files.length) {
@@ -33,38 +37,46 @@ const getRawRoutesFromDir = (dirname) => __awaiter(void 0, void 0, void 0, funct
             });
         }
         for (const file of files) {
-            const filepath = (0, path_1.join)(dirname, file);
+            let filepath = (0, path_1.join)(dirname, file);
             const isDir = yield (0, file_1.isDirectory)(filepath);
+            if (isDir) {
+                // transform '/foo' to '/foo/' if `foo` is a dir,
+                // this is required for matchFile to wrok properly
+                filepath = (0, path_1.join)(filepath, path_1.sep);
+            }
+            if (!(0, matchSpec_1.matchFile)(filepath, patterns, false)) {
+                continue;
+            }
+            const segment = parentDir === '' ? '/' : (0, helpers_1.normalizeRoutePath)(parentDir);
             if (isDir) {
                 if (onlyHasDir) {
                     // only indent segment,routes was in same level.
-                    yield _getRawRoutesFromDir(filepath, rawRoutes, `${segment}/${file}`);
-                    continue;
+                    yield visitDirectory(filepath, routes, `${parentDir}/${file}`);
                 }
-                const rawRoute = {
-                    kind: 'dir',
+                else {
+                    const route = {
+                        kind: 'dir',
+                        filepath,
+                        segment: segment,
+                        children: []
+                    };
+                    routes.push(route);
+                    yield visitDirectory(filepath, route.children, file);
+                }
+            }
+            else {
+                const ext = (0, path_1.extname)(file);
+                const type = (0, path_1.basename)(file, ext);
+                routes.push({
+                    kind: 'file',
+                    segment: segment,
                     filepath,
-                    segment: (0, helpers_1.normalize)(file).replace(/^\//, ''),
-                    parentSegment: (0, helpers_1.normalize)(segment).replace(/^\//, ''),
-                    children: []
-                };
-                yield _getRawRoutesFromDir(filepath, rawRoute.children, file);
-                rawRoutes.push(rawRoute);
-                continue;
+                    type
+                });
             }
-            const ext = (0, path_1.extname)(file);
-            const type = (0, path_1.basename)(file, ext);
-            rawRoutes.push({
-                kind: 'file',
-                name: file,
-                segment: (0, helpers_1.normalize)(segment),
-                filepath,
-                type
-            });
         }
-        return rawRoutes;
     });
-    const routes = yield _getRawRoutesFromDir(dirname, [], '');
+    yield visitDirectory(rootDirname, routes, '');
     return {
         routes,
         warnings,
@@ -72,9 +84,16 @@ const getRawRoutesFromDir = (dirname) => __awaiter(void 0, void 0, void 0, funct
     };
 });
 exports.getRawRoutesFromDir = getRawRoutesFromDir;
-const getPageRoutes = (dirname) => __awaiter(void 0, void 0, void 0, function* () {
-    const { routes: rawRoutes, warnings, errors } = yield (0, exports.getRawRoutesFromDir)(dirname);
-    const _getPageRoutes = (rawRoutes, routes, segment = '') => {
+const getPageRoutes = (dir, excludes) => __awaiter(void 0, void 0, void 0, function* () {
+    let raw;
+    if (typeof dir === 'string') {
+        raw = yield (0, exports.getRawRoutesFromDir)(dir, excludes);
+    }
+    else {
+        raw = dir;
+    }
+    const { routes: rawRoutes, warnings, errors } = raw;
+    const _getPageRoutes = (rawRoutes, routes, parentSegment = '') => {
         const layoutRoute = rawRoutes.some(route => route.kind === 'file' && route.type === 'layout');
         const route = {};
         if (layoutRoute) {
@@ -83,10 +102,10 @@ const getPageRoutes = (dirname) => __awaiter(void 0, void 0, void 0, function* (
         for (const rawRoute of rawRoutes) {
             if (rawRoute.kind === 'dir') {
                 const workRoutes = layoutRoute ? route.children : routes;
-                const preSegment = layoutRoute
+                const nextSegment = layoutRoute
                     ? ''
-                    : `${segment}${rawRoute.parentSegment}/`;
-                _getPageRoutes(rawRoute.children, workRoutes, preSegment);
+                    : (0, helpers_1.combineComponents)(parentSegment, rawRoute.segment);
+                _getPageRoutes(rawRoute.children, workRoutes, nextSegment);
             }
             else if (rawRoute.type === 'page' || rawRoute.type === 'layout') {
                 if (rawRoute.type === 'page' && layoutRoute) {
@@ -96,10 +115,8 @@ const getPageRoutes = (dirname) => __awaiter(void 0, void 0, void 0, function* (
                     });
                 }
                 else {
-                    let prefix = segment;
-                    let suffix = rawRoute.segment;
                     route.component = rawRoute.filepath;
-                    route.path = `${prefix}${suffix}`;
+                    route.path = (0, helpers_1.combineComponents)(parentSegment, rawRoute.segment);
                     routes.push(Object.assign({}, route));
                 }
             }
@@ -107,11 +124,6 @@ const getPageRoutes = (dirname) => __awaiter(void 0, void 0, void 0, function* (
         return routes;
     };
     const routes = (0, helpers_1.sortRoutes)(_getPageRoutes(rawRoutes, []));
-    routes.forEach(route => {
-        if (!route.path.startsWith('/')) {
-            route.path = `/${route.path}`;
-        }
-    });
     return {
         routes,
         warnings,
@@ -119,44 +131,46 @@ const getPageRoutes = (dirname) => __awaiter(void 0, void 0, void 0, function* (
     };
 });
 exports.getPageRoutes = getPageRoutes;
-const getApiRoutes = (dir) => __awaiter(void 0, void 0, void 0, function* () {
+const getApiRoutes = (dir, excludes) => __awaiter(void 0, void 0, void 0, function* () {
+    let raw;
+    if (typeof dir === 'string') {
+        raw = yield (0, exports.getRawRoutesFromDir)(dir, excludes);
+    }
+    else {
+        raw = dir;
+    }
+    const { routes: rawRoutes, warnings, errors } = raw;
     const getConflictWaring = (rawRoute, conflictRawRoute) => {
         return `Find both ${(0, path_1.basename)(conflictRawRoute.filepath)} and ${(0, path_1.basename)(rawRoute.filepath)} in "${(0, path_1.dirname)(rawRoute.filepath)}"!, only "${(0, path_1.basename)(conflictRawRoute.filepath)}" is used.`;
     };
-    const { routes: rawRoutes, warnings, errors } = yield (0, exports.getRawRoutesFromDir)(dir);
-    const _getApiRoutes = (rawRoutes, routes, prefix = '') => {
+    const _getApiRoutes = (rawRoutes, routes, parentSegment = '') => {
         const page = rawRoutes.find(route => route.kind === 'file' && route.type === 'page');
         const layout = rawRoutes.find(route => route.kind === 'file' && route.type === 'layout');
         const allowedRoutes = rawRoutes.filter(route => route.kind === 'dir' || route.type === 'api');
         for (let rawRoute of allowedRoutes) {
-            prefix = prefix === '/' ? '' : prefix;
+            const currentPath = (0, helpers_1.combineComponents)(parentSegment, rawRoute.segment);
             if (rawRoute.kind === 'dir') {
-                _getApiRoutes(rawRoute.children, routes, prefix + '/' + rawRoute.parentSegment);
-                continue;
+                _getApiRoutes(rawRoute.children, routes, currentPath);
             }
-            if (rawRoute.type === 'api') {
+            else if (rawRoute.type === 'api') {
                 if (layout) {
                     warnings.push({
                         type: 'api',
                         msg: getConflictWaring(rawRoute, layout)
                     });
-                    continue;
                 }
-                if (page) {
+                else if (page) {
                     warnings.push({
                         type: 'api',
                         msg: getConflictWaring(rawRoute, page)
                     });
-                    continue;
                 }
-                let path = prefix + '/' + rawRoute.segment;
-                if (path === '//') {
-                    path = '/';
+                else {
+                    routes.push({
+                        path: currentPath,
+                        api: rawRoute.filepath
+                    });
                 }
-                routes.push({
-                    path,
-                    api: rawRoute.filepath
-                });
             }
         }
         return routes;
@@ -170,26 +184,27 @@ const getApiRoutes = (dir) => __awaiter(void 0, void 0, void 0, function* () {
     };
 });
 exports.getApiRoutes = getApiRoutes;
-const getMiddlewareRoutes = (dirname) => __awaiter(void 0, void 0, void 0, function* () {
-    const { routes: rawRoutes, warnings, errors } = yield (0, exports.getRawRoutesFromDir)(dirname);
-    const _getMiddlewareRoutes = (rawRoutes, routes, segment) => {
-        segment = segment === '/' ? '' : segment;
+const getMiddlewareRoutes = (dir, excludes) => __awaiter(void 0, void 0, void 0, function* () {
+    let raw;
+    if (typeof dir === 'string') {
+        raw = yield (0, exports.getRawRoutesFromDir)(dir, excludes);
+    }
+    else {
+        raw = dir;
+    }
+    const { routes: rawRoutes, warnings, errors } = raw;
+    const _getMiddlewareRoutes = (rawRoutes, routes, parentSegment) => {
         for (const rawRoute of rawRoutes) {
+            const currentPath = (0, helpers_1.combineComponents)(parentSegment, rawRoute.segment);
             if (rawRoute.kind === 'dir') {
-                _getMiddlewareRoutes(rawRoute.children, routes, segment + '/' + rawRoute.parentSegment);
-                continue;
+                _getMiddlewareRoutes(rawRoute.children, routes, currentPath);
             }
-            if (rawRoute.type === 'middleware') {
-                let path = segment + '/' + rawRoute.segment;
-                let catchAllOp = '/*';
-                if (path === '//') {
-                    path = '/';
-                }
-                if (path === '/') {
-                    catchAllOp = catchAllOp.slice(1);
-                }
+            else if (rawRoute.type === 'middleware') {
                 routes.push({
-                    path: path + catchAllOp,
+                    // catch all
+                    path: currentPath.endsWith('/')
+                        ? `${currentPath}*`
+                        : `${currentPath}/*`,
                     middleware: rawRoute.filepath
                 });
             }
@@ -197,11 +212,6 @@ const getMiddlewareRoutes = (dirname) => __awaiter(void 0, void 0, void 0, funct
         return routes;
     };
     const routes = (0, helpers_1.sortRoutes)(_getMiddlewareRoutes(rawRoutes, [], ''));
-    routes.forEach(route => {
-        if (!route.path.startsWith('/')) {
-            route.path = `/${route.path}`;
-        }
-    });
     const exceptionFilter = (e) => e.type === 'middleware';
     return {
         routes,

package/lib/shared/application.d.ts

@@ -1,78 +1,25 @@
-import { IRouter } from './routerTypes';
-import { IStoreManager, IApplication, IAppContext, IApplicationOptions, IRerenderConfig } from './applicationTypes';
+import { IRouter, IPageRouteRecord } from './routerTypes';
+import { RedoxStore, IApplication, IAppContext, IApplicationOptions, IRerenderConfig, IError } from './applicationTypes';
 export declare class Application {
-    private _error;
     private _router;
     private _appComponent;
     private _pluginManager;
     private _context;
-    private _storeManager;
+    private _store;
+    private _error;
+    private _loader;
     constructor(options: IApplicationOptions);
-    get router(): IRouter<any>;
+    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(): {
-        $state: import("./applicationTypes").IErrorState;
-        $set: (state: import("@shuvi/redox").State) => void;
-        $modify: (modifier: (state: import("./applicationTypes").IErrorState) => void) => void;
-        $patch: (partState: import("@shuvi/redox").ObjectState) => void;
-        $actions: {
-            setError: (payload?: import("./applicationTypes").IError | undefined) => import("@shuvi/redox").Action<import("./applicationTypes").IError | undefined>;
-        } & {
-            error: (payload?: import("./applicationTypes").IError | undefined) => void;
-            clear: () => void;
-        } & {
-            [X: string]: never;
-            [X: number]: never;
-            [X: symbol]: never;
-        };
-        $views: import("@shuvi/redox").RedoxViews<({
-            getError(): import("./applicationTypes").IError | undefined;
-            hasError(): boolean;
-        } & ThisType<import("./applicationTypes").IErrorState & {
-            $state: import("./applicationTypes").IErrorState;
-        } & import("@shuvi/redox").RedoxViews<{
-            getError(): import("./applicationTypes").IError | undefined;
-            hasError(): boolean;
-        }> & {
-            $dep: {} & {} & {};
-        }>) | undefined>;
-        $createSelector: <TReturn>(selector: import("@shuvi/redox").ISelector<import("@shuvi/redox").Model<"error", import("./applicationTypes").IErrorState, {}, {
-            setError(_state: import("./applicationTypes").IErrorState, error?: import("./applicationTypes").IError | undefined): {
-                error: import("./applicationTypes").IError | undefined;
-            };
-        }, {
-            error(payload?: import("./applicationTypes").IError | undefined): void;
-            clear(): void;
-        }, {
-            getError(): import("./applicationTypes").IError | undefined;
-            hasError(): boolean;
-        }>, TReturn>) => (() => TReturn) & {
-            clearCache: () => void;
-        };
-    } & import("@shuvi/redox").RedoxViews<{
-        getError(): import("./applicationTypes").IError | undefined;
-        hasError(): boolean;
-    } & ThisType<import("./applicationTypes").IErrorState & {
-        $state: import("./applicationTypes").IErrorState;
-    } & import("@shuvi/redox").RedoxViews<{
-        getError(): import("./applicationTypes").IError | undefined;
-        hasError(): boolean;
-    }> & {
-        $dep: {} & {} & {};
-    }>> & {
-        setError: (payload?: import("./applicationTypes").IError | undefined) => import("@shuvi/redox").Action<import("./applicationTypes").IError | undefined>;
-    } & {
-        error: (payload?: import("./applicationTypes").IError | undefined) => void;
-        clear: () => void;
-    } & {
-        [X: string]: never;
-        [X: number]: never;
-        [X: symbol]: never;
-    };
+    get error(): IError | undefined;
+    setError(err: IError): void;
+    clearError(): void;
+    getLoadersData(): Record<string, any>;
+    setLoadersData(datas: Record<string, any>): void;
     init(): Promise<void>;
-    get storeManager(): IStoreManager;
+    get store(): RedoxStore;
     updateComponents({ AppComponent }?: IRerenderConfig): Promise<void>;
     dispose(): Promise<void>;
     private _initPlugin;

package/lib/shared/application.js

@@ -10,19 +10,21 @@ 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");
 class Application {
     constructor(options) {
         this._router = options.router;
         this._context = {};
-        this._storeManager = (0, redox_1.redox)({ initialState: options.initialState });
-        this._error = this._storeManager.get(error_1.errorModel);
+        this._store = (0, redox_1.redox)({ initialState: options.initialState });
+        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;
@@ -37,7 +39,19 @@ class Application {
         return this._appComponent;
     }
     get error() {
-        return this._error;
+        return this._error.errorObject;
+    }
+    setError(err) {
+        this._error.set(err);
+    }
+    clearError() {
+        this._error.clear();
+    }
+    getLoadersData() {
+        return this._loader.getAllData;
+    }
+    setLoadersData(datas) {
+        this._loader.setDatas(datas);
     }
     init() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -47,8 +61,8 @@ class Application {
             this._router.init();
         });
     }
-    get storeManager() {
-        return this._storeManager;
+    get store() {
+        return this._store;
     }
     updateComponents({ AppComponent } = {}) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -79,12 +93,27 @@ class Application {
         });
     }
     getPublicAPI() {
+        const self = this;
         return {
-            context: this._context,
-            router: this._router,
-            appComponent: this._appComponent,
-            storeManager: this._storeManager,
-            error: this._error
+            context: self._context,
+            router: self._router,
+            appComponent: self._appComponent,
+            store: self._store,
+            get error() {
+                return self.error;
+            },
+            setError(err) {
+                self.setError(err);
+            },
+            clearError() {
+                self.clearError();
+            },
+            getLoadersData() {
+                return self.getLoadersData();
+            },
+            setLoadersData(datas) {
+                self.setLoadersData(datas);
+            }
         };
     }
 }

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 } from './routerTypes';
-import { IPluginList } from './lifecycle';
-export declare type IRequest = IncomingMessage & {
-    [x: string]: any;
-};
+import { IRouter, IPageRouteRecord } from './routerTypes';
+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;
@@ -24,18 +23,16 @@ export interface IErrorState {
 export declare type IAppState = {
     error?: IErrorState;
 };
-export interface IErrorManager {
-    getError: IError | undefined;
-    error: (err: IError) => void;
-    clear: () => void;
-    hasError: boolean;
-}
 export interface IApplication {
     readonly context: IAppContext;
-    readonly router: IRouter;
+    readonly router: IRouter<IPageRouteRecord>;
     readonly appComponent: any;
-    readonly error: IErrorManager;
-    readonly storeManager: IStoreManager;
+    readonly store: RedoxStore;
+    readonly error: IError | undefined;
+    setError(err: IError): void;
+    clearError(): void;
+    getLoadersData(): Record<string, any>;
+    setLoadersData(datas: Record<string, any>): void;
 }
 export interface IApplicationOptions {
     router: IRouter;

package/lib/shared/helper/getAppData.d.ts

@@ -5,13 +5,10 @@ export declare type IData = {
 export declare type IAppData<Data = {}, appState = any> = {
     ssr: boolean;
     runtimeConfig?: Record<string, string>;
+    appState?: appState;
     pageData?: {
         [key: string]: any;
     };
-    loadersData?: {
-        [x: string]: any;
-    };
-    appState?: appState;
     filesByRoutId: Record<string, string[]>;
     publicPath: string;
 } & {

package/lib/shared/helper/getAppData.js

@@ -20,7 +20,6 @@ function getAppData() {
         return {
             ssr: false,
             pageData: {},
-            loadersData: {},
             filesByRoutId: {},
             publicPath: ''
         };

package/lib/shared/helper/getPublicPath.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPublicPath = void 0;
-const constants_1 = require("@shuvi/shared/lib/constants");
 const getAppData_1 = require("./getAppData");
 function getPublicPath() {
     const { publicPath } = (0, getAppData_1.getAppData)();
-    return window[constants_1.IDENTITY_RUNTIME_PUBLICPATH] || publicPath;
+    return publicPath;
 }
 exports.getPublicPath = getPublicPath;

package/lib/shared/index.d.ts

@@ -4,6 +4,8 @@ export * from './router';
 export * from './response';
 export * from './loader';
 export { errorModel } from './models/error';
+export { loaderModel } from './models/loader';
 export * from './applicationTypes';
 export type { Application } from './application';
-export { IAppModule, IPluginInstance, BuiltInRuntimePluginHooks, CustomRuntimePluginHooks, RuntimePluginHooks, createRuntimePlugin, RuntimePluginInstance } from './lifecycle';
+export type { IRuntimeConfig } from './runtimeConfigTypes';
+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.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);
@@ -22,7 +22,10 @@ __exportStar(require("./response"), exports);
 __exportStar(require("./loader"), exports);
 var error_1 = require("./models/error");
 Object.defineProperty(exports, "errorModel", { enumerable: true, get: function () { return error_1.errorModel; } });
+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/index.d.ts

@@ -1,3 +1,2 @@
 export * from './loader';
-export * from './loaderManager';
 export * from './types';

package/lib/shared/loader/index.js

@@ -15,5 +15,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./loader"), exports);
-__exportStar(require("./loaderManager"), exports);
 __exportStar(require("./types"), exports);

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
      */