@shuvi/platform-shared 1.0.47 → 1.0.49

package/esm/shared/applicationTypes.d.ts

@@ -18,6 +18,7 @@ export interface IError {
     message?: string;
     source?: ErrorSource;
     error?: Error;
+    fatal?: boolean;
 }
 export interface IErrorState {
     error: IError | null;

package/esm/shared/loader/loader.js

@@ -67,9 +67,9 @@ function redirectHelper(to, status = 302) {
     }
     throw createRedirect(to, status);
 }
-function errorHelper(msg, statusCode = 500) {
+function errorHelper(msg, statusCode = 500, { fatal = false } = {}) {
     invariant(statusCode >= 400 && statusCode < 600, 'status code should be 4xx and 5xx');
-    throw response(msg, { status: statusCode });
+    throw response({ error: true, fatal: fatal }, { status: statusCode, statusText: msg });
 }
 export function createLoaderContext({ pathname, query, params, req, getAppContext }) {
     return Object.assign({ pathname,

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

@@ -13,7 +13,9 @@ export declare type RedirectFunction = (to: string, status?: number) => any;
 export interface ErrorFunction {
     (): any;
     (msg: string): any;
-    (msg: string, statusCode?: number): any;
+    (msg: string, statusCode?: number, options?: {
+        fatal?: boolean;
+    }): any;
 }
 /**
  * route component getInitialProps params `context`

package/esm/shared/response.d.ts

@@ -33,9 +33,9 @@ declare class Headers {
         };
     };
 }
-export declare type ResponseType = 'text' | 'json' | 'redirect' | 'plain';
+export declare type ResponseType = 'text' | 'json' | 'redirect' | 'raw';
 export interface Response {
-    readonly data: string;
+    readonly data: any;
     readonly status: number;
     readonly statusText: string;
     readonly headers: Headers;

package/esm/shared/response.js

@@ -108,7 +108,7 @@ export const isJson = createTypeCreator('json');
 export const isText = createTypeCreator('text');
 export const isRedirect = createTypeCreator('redirect');
 export function response(data, options) {
-    return new ResponseImpl(data, 'plain', options);
+    return new ResponseImpl(data, 'raw', options);
 }
 export function json(data) {
     return new ResponseImpl(data, 'json');

package/esm/shuvi-app/application.js

@@ -34,7 +34,11 @@ function getPlugins(runtime, pluginRecords) {
             pluginConstructor[method] = runtime[method];
         }
     }
-    plugins.push([createRuntimePlugin(pluginConstructor)]);
+    plugins.push([
+        createRuntimePlugin(pluginConstructor, {
+            name: 'shuvi-user-app'
+        })
+    ]);
     return plugins;
 }
 export default function application(options) {

package/lib/shared/applicationTypes.d.ts

@@ -18,6 +18,7 @@ export interface IError {
     message?: string;
     source?: ErrorSource;
     error?: Error;
+    fatal?: boolean;
 }
 export interface IErrorState {
     error: IError | null;

package/lib/shared/loader/loader.js

@@ -74,9 +74,9 @@ function redirectHelper(to, status = 302) {
     }
     throw (0, response_1.redirect)(to, status);
 }
-function errorHelper(msg, statusCode = 500) {
+function errorHelper(msg, statusCode = 500, { fatal = false } = {}) {
     (0, invariant_1.default)(statusCode >= 400 && statusCode < 600, 'status code should be 4xx and 5xx');
-    throw (0, response_1.response)(msg, { status: statusCode });
+    throw (0, response_1.response)({ error: true, fatal: fatal }, { status: statusCode, statusText: msg });
 }
 function createLoaderContext({ pathname, query, params, req, getAppContext }) {
     return Object.assign({ pathname,

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

@@ -13,7 +13,9 @@ export declare type RedirectFunction = (to: string, status?: number) => any;
 export interface ErrorFunction {
     (): any;
     (msg: string): any;
-    (msg: string, statusCode?: number): any;
+    (msg: string, statusCode?: number, options?: {
+        fatal?: boolean;
+    }): any;
 }
 /**
  * route component getInitialProps params `context`

package/lib/shared/response.d.ts

@@ -33,9 +33,9 @@ declare class Headers {
         };
     };
 }
-export declare type ResponseType = 'text' | 'json' | 'redirect' | 'plain';
+export declare type ResponseType = 'text' | 'json' | 'redirect' | 'raw';
 export interface Response {
-    readonly data: string;
+    readonly data: any;
     readonly status: number;
     readonly statusText: string;
     readonly headers: Headers;

package/lib/shared/response.js

@@ -112,7 +112,7 @@ exports.isJson = createTypeCreator('json');
 exports.isText = createTypeCreator('text');
 exports.isRedirect = createTypeCreator('redirect');
 function response(data, options) {
-    return new ResponseImpl(data, 'plain', options);
+    return new ResponseImpl(data, 'raw', options);
 }
 exports.response = response;
 function json(data) {

package/package.json

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