@shuvi/platform-shared 1.0.18 → 1.0.20

package/esm/shared/application.d.ts

@@ -1,5 +1,5 @@
 import { IRouter, IPageRouteRecord } from './routerTypes';
-import { Doura, Application, IAppContext, ApplicationOptions, IRerenderConfig, IError } from './applicationTypes';
+import { Doura, Application, IAppContext, ApplicationInternalOptions, IRerenderConfig, IError } from './applicationTypes';
 export declare class ApplicationImpl<Config extends {} = {}> {
     private _router;
     private _appComponent;
@@ -9,7 +9,8 @@ export declare class ApplicationImpl<Config extends {} = {}> {
     private _store;
     private _error;
     private _loader;
-    constructor(options: ApplicationOptions<Config>);
+    private _getLoaders;
+    constructor(options: ApplicationInternalOptions<Config>);
     get router(): IRouter<IPageRouteRecord>;
     get config(): Config;
     get context(): IAppContext;
@@ -18,6 +19,7 @@ export declare class ApplicationImpl<Config extends {} = {}> {
     get error(): IError | null;
     setError(err: IError): void;
     clearError(): void;
+    getLoaders(): Promise<Record<string, import("./index").Loader<any>>>;
     getLoadersData(): Record<string, any>;
     setLoadersData(datas: Record<string, any>): void;
     init(): Promise<void>;

package/esm/shared/application.js

@@ -20,6 +20,7 @@ export class ApplicationImpl {
         this._store = doura({ initialState: options.initialState });
         this._error = this._store.getModel(errorModelName, errorModel);
         this._loader = this._store.getModel(loaderModelName, loaderModel);
+        this._getLoaders = options.getLoaders;
         this._appComponent = options.AppComponent;
         this._pluginManager = getManager();
         initPlugins(this._pluginManager, options.plugins || []);
@@ -48,6 +49,9 @@ export class ApplicationImpl {
     clearError() {
         this._error.clear();
     }
+    getLoaders() {
+        return this._getLoaders();
+    }
     getLoadersData() {
         return this._loader.getAllData;
     }

package/esm/shared/applicationTypes.d.ts

@@ -2,6 +2,8 @@ import { Doura } from 'doura';
 import { CustomAppContext } from '@shuvi/runtime';
 import { IRouter, IPageRouteRecord } from './routerTypes';
 import { IPluginList } from './runtimPlugin';
+import { Loader } from './loader';
+export declare type Loaders = Record<string, Loader>;
 export interface IAppContext extends CustomAppContext {
     [x: string]: unknown;
 }
@@ -35,10 +37,15 @@ export interface Application<Config extends {} = {}> {
     getLoadersData(): Record<string, any>;
     setLoadersData(datas: Record<string, any>): void;
 }
-export interface ApplicationOptions<C extends {}> {
+export interface GetLoadersFn {
+    (): Promise<Record<string, Loader>>;
+}
+export interface ApplicationInternalOptions<C extends {}> {
     config: C;
     router: IRouter;
     AppComponent: any;
+    getLoaders: GetLoadersFn;
     initialState?: IAppState;
     plugins?: IPluginList;
 }
+export declare type ApplicationlOptions<C extends {}> = Omit<ApplicationInternalOptions<C>, 'getLoaders' | 'plugins'>;

package/esm/shared/loader/loader.js

@@ -84,20 +84,26 @@ export function runLoaders(matches, loadersByRouteId, { pathname, query, params,
                 return;
             }
             let res;
+            let error;
             try {
                 const value = yield loaderFn(Object.assign({ pathname,
                     params,
                     query, redirect: redirectHelper, error: errorHelper, appContext }, (req ? { req } : {})));
                 if (value === undefined) {
-                    throw new Error(`You defined a loader for route "${match.route.path}" but didn't return ` +
+                    error = new Error(`You defined a loader for route "${match.route.path}" but didn't return ` +
                         `anything from your \`loader\` function. Please return a value or \`null\`.`);
                 }
-                res = createJson(value);
+                else {
+                    res = createJson(value);
+                }
             }
-            catch (error) {
-                if (process.env.NODE_ENV === 'development' && !isResponse(error)) {
-                    console.error(`loader function error of route "${match.route.path}"`);
+            catch (err) {
+                if (process.env.NODE_ENV === 'development' && !isResponse(err)) {
+                    console.error(`error occurs in loader function of route "${match.route.path}"`);
                 }
+                error = err;
+            }
+            if (error) {
                 throw error;
             }
             return res;

package/esm/shuvi-app/application.bare.d.ts

@@ -1,4 +1,4 @@
 import { ApplicationImpl } from '../shared/application';
-import { ApplicationOptions } from './shared';
+import { ApplicationlOptions } from './shared';
 export { ApplicationImpl };
-export default function application<C extends {}>(options: ApplicationOptions<C>): ApplicationImpl<C>;
+export default function application<C extends {}>(options: ApplicationlOptions<C>): ApplicationImpl<C>;

package/esm/shuvi-app/application.bare.js

@@ -1,6 +1,6 @@
 import { ApplicationImpl } from '../shared/application';
 export { ApplicationImpl };
 export default function application(options) {
-    const application = new ApplicationImpl(Object.assign({}, options));
+    const application = new ApplicationImpl(Object.assign(Object.assign({}, options), { getLoaders: () => Promise.resolve({}) }));
     return application;
 }

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

@@ -1,4 +1,4 @@
 import { ApplicationImpl } from '../shared/application';
-import { ApplicationOptions } from './shared';
+import { ApplicationlOptions } from './shared';
 export { ApplicationImpl };
-export default function application<C extends {}>(options: ApplicationOptions<C>): ApplicationImpl<C>;
+export default function application<C extends {}>(options: ApplicationlOptions<C>): ApplicationImpl<C>;

package/esm/shuvi-app/application.js

@@ -1,3 +1,12 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 import * as customApp from '@shuvi/app/user/app';
 import { pluginRecord } from '@shuvi/app/core/plugins';
 import { ApplicationImpl } from '../shared/application';
@@ -29,6 +38,14 @@ function getPlugins(runtime, pluginRecords) {
     return plugins;
 }
 export default function application(options) {
-    const application = new ApplicationImpl(Object.assign(Object.assign({}, options), { plugins: getPlugins(customApp, pluginRecord) }));
+    const application = new ApplicationImpl(Object.assign(Object.assign({}, options), { getLoaders: () => __awaiter(this, void 0, void 0, function* () {
+            const mod = yield import(
+            /* webpackChunkName: "loaders" */
+            '@shuvi/app/files/page-loaders');
+            return mod.default || mod;
+        }), plugins: getPlugins(customApp, pluginRecord) }));
     return application;
 }
+if (module.hot) {
+    module.hot.accept('@shuvi/app/files/page-loaders');
+}

package/lib/node/route/route.js

@@ -84,7 +84,7 @@ exports.getRawRoutesFromDir = getRawRoutesFromDir;
 const getPageRoutes = (dir, { includes, excludes } = {}) => __awaiter(void 0, void 0, void 0, function* () {
     let raw;
     if (typeof dir === 'string') {
-        raw = yield (0, exports.getRawRoutesFromDir)(dir, { excludes });
+        raw = yield (0, exports.getRawRoutesFromDir)(dir, { includes, excludes });
     }
     else {
         raw = dir;
@@ -131,7 +131,7 @@ exports.getPageRoutes = getPageRoutes;
 const getApiRoutes = (dir, { includes, excludes } = {}) => __awaiter(void 0, void 0, void 0, function* () {
     let raw;
     if (typeof dir === 'string') {
-        raw = yield (0, exports.getRawRoutesFromDir)(dir, { excludes });
+        raw = yield (0, exports.getRawRoutesFromDir)(dir, { includes, excludes });
     }
     else {
         raw = dir;
@@ -184,7 +184,7 @@ exports.getApiRoutes = getApiRoutes;
 const getMiddlewareRoutes = (dir, { includes, excludes } = {}) => __awaiter(void 0, void 0, void 0, function* () {
     let raw;
     if (typeof dir === 'string') {
-        raw = yield (0, exports.getRawRoutesFromDir)(dir, { excludes });
+        raw = yield (0, exports.getRawRoutesFromDir)(dir, { includes, excludes });
     }
     else {
         raw = dir;

package/lib/shared/application.d.ts

@@ -1,5 +1,5 @@
 import { IRouter, IPageRouteRecord } from './routerTypes';
-import { Doura, Application, IAppContext, ApplicationOptions, IRerenderConfig, IError } from './applicationTypes';
+import { Doura, Application, IAppContext, ApplicationInternalOptions, IRerenderConfig, IError } from './applicationTypes';
 export declare class ApplicationImpl<Config extends {} = {}> {
     private _router;
     private _appComponent;
@@ -9,7 +9,8 @@ export declare class ApplicationImpl<Config extends {} = {}> {
     private _store;
     private _error;
     private _loader;
-    constructor(options: ApplicationOptions<Config>);
+    private _getLoaders;
+    constructor(options: ApplicationInternalOptions<Config>);
     get router(): IRouter<IPageRouteRecord>;
     get config(): Config;
     get context(): IAppContext;
@@ -18,6 +19,7 @@ export declare class ApplicationImpl<Config extends {} = {}> {
     get error(): IError | null;
     setError(err: IError): void;
     clearError(): void;
+    getLoaders(): Promise<Record<string, import("./index").Loader<any>>>;
     getLoadersData(): Record<string, any>;
     setLoadersData(datas: Record<string, any>): void;
     init(): Promise<void>;

package/lib/shared/application.js

@@ -23,6 +23,7 @@ class ApplicationImpl {
         this._store = (0, doura_1.doura)({ initialState: options.initialState });
         this._error = this._store.getModel(error_1.errorModelName, error_1.errorModel);
         this._loader = this._store.getModel(loader_1.loaderModelName, loader_1.loaderModel);
+        this._getLoaders = options.getLoaders;
         this._appComponent = options.AppComponent;
         this._pluginManager = (0, runtimPlugin_1.getManager)();
         (0, runtimPlugin_2.initPlugins)(this._pluginManager, options.plugins || []);
@@ -51,6 +52,9 @@ class ApplicationImpl {
     clearError() {
         this._error.clear();
     }
+    getLoaders() {
+        return this._getLoaders();
+    }
     getLoadersData() {
         return this._loader.getAllData;
     }

package/lib/shared/applicationTypes.d.ts

@@ -2,6 +2,8 @@ import { Doura } from 'doura';
 import { CustomAppContext } from '@shuvi/runtime';
 import { IRouter, IPageRouteRecord } from './routerTypes';
 import { IPluginList } from './runtimPlugin';
+import { Loader } from './loader';
+export declare type Loaders = Record<string, Loader>;
 export interface IAppContext extends CustomAppContext {
     [x: string]: unknown;
 }
@@ -35,10 +37,15 @@ export interface Application<Config extends {} = {}> {
     getLoadersData(): Record<string, any>;
     setLoadersData(datas: Record<string, any>): void;
 }
-export interface ApplicationOptions<C extends {}> {
+export interface GetLoadersFn {
+    (): Promise<Record<string, Loader>>;
+}
+export interface ApplicationInternalOptions<C extends {}> {
     config: C;
     router: IRouter;
     AppComponent: any;
+    getLoaders: GetLoadersFn;
     initialState?: IAppState;
     plugins?: IPluginList;
 }
+export declare type ApplicationlOptions<C extends {}> = Omit<ApplicationInternalOptions<C>, 'getLoaders' | 'plugins'>;

package/lib/shared/loader/loader.js

@@ -91,20 +91,26 @@ function runLoaders(matches, loadersByRouteId, { pathname, query, params, req, g
                 return;
             }
             let res;
+            let error;
             try {
                 const value = yield loaderFn(Object.assign({ pathname,
                     params,
                     query, redirect: redirectHelper, error: errorHelper, appContext }, (req ? { req } : {})));
                 if (value === undefined) {
-                    throw new Error(`You defined a loader for route "${match.route.path}" but didn't return ` +
+                    error = new Error(`You defined a loader for route "${match.route.path}" but didn't return ` +
                         `anything from your \`loader\` function. Please return a value or \`null\`.`);
                 }
-                res = (0, response_1.json)(value);
+                else {
+                    res = (0, response_1.json)(value);
+                }
             }
-            catch (error) {
-                if (process.env.NODE_ENV === 'development' && !(0, response_1.isResponse)(error)) {
-                    console.error(`loader function error of route "${match.route.path}"`);
+            catch (err) {
+                if (process.env.NODE_ENV === 'development' && !(0, response_1.isResponse)(err)) {
+                    console.error(`error occurs in loader function of route "${match.route.path}"`);
                 }
+                error = err;
+            }
+            if (error) {
                 throw error;
             }
             return res;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/platform-shared",
-  "version": "1.0.18",
+  "version": "1.0.20",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -83,17 +83,17 @@
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@shuvi/hook": "1.0.18",
-    "doura": "0.0.8",
-    "@shuvi/router": "1.0.18",
-    "@shuvi/runtime": "1.0.18",
-    "@shuvi/shared": "1.0.18",
-    "@shuvi/toolpack": "1.0.18",
-    "@shuvi/utils": "1.0.18",
+    "@shuvi/hook": "1.0.20",
+    "doura": "0.0.9",
+    "@shuvi/router": "1.0.20",
+    "@shuvi/runtime": "1.0.20",
+    "@shuvi/shared": "1.0.20",
+    "@shuvi/toolpack": "1.0.20",
+    "@shuvi/utils": "1.0.20",
     "redux": "4.1.2"
   },
   "peerDependencies": {
-    "@shuvi/service": "1.0.18"
+    "@shuvi/service": "1.0.20"
   },
   "devDependencies": {
     "@shuvi/service": "workspace:*",

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

@@ -42,3 +42,10 @@ declare module '@shuvi/app/user/app' {
   export const appContext: IAppModule['appContext'];
   export const dispose: IAppModule['dispose'];
 }
+
+declare module '@shuvi/app/files/page-loaders' {
+  import { Loaders } from '@shuvi/platform-shared/shared';
+
+  const loaders: Loaders;
+  export default loaders;
+}