@shuvi/platform-shared 1.0.41 → 1.0.43

package/esm/shared/application.d.ts

@@ -4,6 +4,7 @@ export declare class ApplicationImpl<Config extends {} = {}> {
     private _router;
     private _appComponent;
     private _pluginManager;
+    private _request?;
     private _context;
     private _config;
     private _store;

package/esm/shared/application.js

@@ -16,6 +16,7 @@ export class ApplicationImpl {
     constructor(options) {
         this._config = options.config;
         this._router = options.router;
+        this._request = options.request;
         this._context = {};
         this._store = doura({ initialState: options.initialState });
         this._error = this._store.getModel(errorModelName, errorModel);
@@ -90,7 +91,8 @@ export class ApplicationImpl {
     _initAppContext() {
         return __awaiter(this, void 0, void 0, function* () {
             yield this._pluginManager.runner.appContext(this._context, {
-                router: this._router
+                router: this._router,
+                request: this._request
             });
         });
     }

package/esm/shared/applicationTypes.d.ts

@@ -1,5 +1,6 @@
 import { Doura } from 'doura';
 import { CustomAppContext } from '@shuvi/runtime';
+import type { ShuviRequest } from '@shuvi/service';
 import { IRouter } from './routerTypes';
 import { IPluginList } from './runtimPlugin';
 import { Loader } from './loader';
@@ -46,5 +47,6 @@ export interface ApplicationInternalOptions<C extends {}> {
     getLoaders: GetLoadersFn;
     initialState?: IAppState;
     plugins?: IPluginList;
+    request?: ShuviRequest;
 }
 export declare type ApplicationlOptions<C extends {}> = Omit<ApplicationInternalOptions<C>, 'getLoaders' | 'plugins'>;

package/esm/shared/loader/loader.js

@@ -118,13 +118,8 @@ export function runLoaders(matches, loadersByRouteId, loaderContext) {
                 throw item.error;
             }
             const routeId = matches[index].route.id;
-            if (item.result) {
-                loaderDatas[routeId] = item.result.data;
-            }
-            else {
-                // allow return undefined
-                loaderDatas[routeId] = undefined;
-            }
+            invariant(item.result, `loader function of route "${matches[index].route.path}" should return a value`);
+            loaderDatas[routeId] = item.result.data;
         }
         return loaderDatas;
     });

package/esm/shared/runtimPlugin.d.ts

@@ -1,10 +1,12 @@
 import { IPluginInstance, IPluginHandlers, HookMap } from '@shuvi/hook';
+import type { ShuviRequest } from '@shuvi/service';
 import { CustomRuntimePluginHooks } from '@shuvi/runtime';
 import { IAppContext } from './applicationTypes';
 import { IRouter } from './routerTypes';
 export declare type AppComponent = unknown;
 export declare type AppContextCtx = {
     router: IRouter;
+    request?: ShuviRequest;
 };
 declare const init: import("@shuvi/hook").AsyncParallelHook<void, void, void>;
 declare const appContext: import("@shuvi/hook").AsyncSeriesHook<IAppContext, AppContextCtx, void>;

package/lib/shared/application.d.ts

@@ -4,6 +4,7 @@ export declare class ApplicationImpl<Config extends {} = {}> {
     private _router;
     private _appComponent;
     private _pluginManager;
+    private _request?;
     private _context;
     private _config;
     private _store;

package/lib/shared/application.js

@@ -19,6 +19,7 @@ class ApplicationImpl {
     constructor(options) {
         this._config = options.config;
         this._router = options.router;
+        this._request = options.request;
         this._context = {};
         this._store = (0, doura_1.doura)({ initialState: options.initialState });
         this._error = this._store.getModel(error_1.errorModelName, error_1.errorModel);
@@ -93,7 +94,8 @@ class ApplicationImpl {
     _initAppContext() {
         return __awaiter(this, void 0, void 0, function* () {
             yield this._pluginManager.runner.appContext(this._context, {
-                router: this._router
+                router: this._router,
+                request: this._request
             });
         });
     }

package/lib/shared/applicationTypes.d.ts

@@ -1,5 +1,6 @@
 import { Doura } from 'doura';
 import { CustomAppContext } from '@shuvi/runtime';
+import type { ShuviRequest } from '@shuvi/service';
 import { IRouter } from './routerTypes';
 import { IPluginList } from './runtimPlugin';
 import { Loader } from './loader';
@@ -46,5 +47,6 @@ export interface ApplicationInternalOptions<C extends {}> {
     getLoaders: GetLoadersFn;
     initialState?: IAppState;
     plugins?: IPluginList;
+    request?: ShuviRequest;
 }
 export declare type ApplicationlOptions<C extends {}> = Omit<ApplicationInternalOptions<C>, 'getLoaders' | 'plugins'>;

package/lib/shared/loader/loader.js

@@ -126,13 +126,8 @@ function runLoaders(matches, loadersByRouteId, loaderContext) {
                 throw item.error;
             }
             const routeId = matches[index].route.id;
-            if (item.result) {
-                loaderDatas[routeId] = item.result.data;
-            }
-            else {
-                // allow return undefined
-                loaderDatas[routeId] = undefined;
-            }
+            (0, invariant_1.default)(item.result, `loader function of route "${matches[index].route.path}" should return a value`);
+            loaderDatas[routeId] = item.result.data;
         }
         return loaderDatas;
     });

package/lib/shared/runtimPlugin.d.ts

@@ -1,10 +1,12 @@
 import { IPluginInstance, IPluginHandlers, HookMap } from '@shuvi/hook';
+import type { ShuviRequest } from '@shuvi/service';
 import { CustomRuntimePluginHooks } from '@shuvi/runtime';
 import { IAppContext } from './applicationTypes';
 import { IRouter } from './routerTypes';
 export declare type AppComponent = unknown;
 export declare type AppContextCtx = {
     router: IRouter;
+    request?: ShuviRequest;
 };
 declare const init: import("@shuvi/hook").AsyncParallelHook<void, void, void>;
 declare const appContext: import("@shuvi/hook").AsyncSeriesHook<IAppContext, AppContextCtx, void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/platform-shared",
-  "version": "1.0.41",
+  "version": "1.0.43",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -83,16 +83,16 @@
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@shuvi/hook": "1.0.41",
+    "@shuvi/hook": "1.0.43",
     "doura": "0.0.13",
-    "@shuvi/router": "1.0.41",
-    "@shuvi/runtime": "1.0.41",
-    "@shuvi/shared": "1.0.41",
-    "@shuvi/toolpack": "1.0.41",
-    "@shuvi/utils": "1.0.41"
+    "@shuvi/router": "1.0.43",
+    "@shuvi/runtime": "1.0.43",
+    "@shuvi/shared": "1.0.43",
+    "@shuvi/toolpack": "1.0.43",
+    "@shuvi/utils": "1.0.43"
   },
   "peerDependencies": {
-    "@shuvi/service": "1.0.41"
+    "@shuvi/service": "1.0.43"
   },
   "devDependencies": {
     "@shuvi/service": "workspace:*",