@shuvi/platform-web 1.0.48 → 1.0.49

package/esm/shuvi-app/app/client.js

@@ -120,7 +120,8 @@ export const createApp = ({ routes, appData, appComponent }) => {
             if (isResponse(error) && error.status >= 400 && error.status < 600) {
                 // client error has no status code
                 app.setError({
-                    message: error.data
+                    message: error.statusText,
+                    fatal: error.data.fatal
                 });
                 next();
                 runLoadersTrace.setAttribute(SHUVI_CLIENT_RUN_LOADERS.attrs.errorType.name, 'userError');

package/esm/shuvi-app/app/server.js

@@ -70,7 +70,8 @@ export const createApp = options => {
                 if (isResponse(error) && error.status >= 400 && error.status < 600) {
                     app.setError({
                         code: error.status,
-                        message: error.data
+                        message: error.statusText,
+                        fatal: error.data.fatal
                     });
                     next();
                     runLoadersTrace.setAttribute(SHUVI_SERVER_RUN_LOADERS.attrs.errorType.name, 'userError');

package/esm/shuvi-app/react/view/ReactView.server.jsx

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import * as React from 'react';
 import { renderToString } from 'react-dom/server';
-import { redirect } from '@shuvi/platform-shared/shared';
+import { redirect, response } from '@shuvi/platform-shared/shared';
 import { SHUVI_ERROR } from '@shuvi/shared/constants';
 import { SERVER_REQUEST } from '@shuvi/shared/constants/trace';
 import { Router } from '@shuvi/router-react';
@@ -24,7 +24,7 @@ export class ReactServerView {
     constructor() {
         this.renderApp = ({ req, app, manifest }) => __awaiter(this, void 0, void 0, function* () {
             yield Loadable.preloadAll();
-            const { router, appComponent: AppComponent, setError: setAppError } = app;
+            const { router, appComponent: AppComponent, setError: setAppError, error } = app;
             yield router.ready;
             // todo: move these into renderer
             let { matches, redirected, state, pathname } = router.current;
@@ -32,6 +32,9 @@ export class ReactServerView {
             if (!matches.length) {
                 setAppError(SHUVI_ERROR.PAGE_NOT_FOUND);
             }
+            if (error && error.fatal) {
+                return response('', { status: error.code, statusText: error.message });
+            }
             if (redirected) {
                 // handel loader redirect
                 if (state &&

package/lib/node/features/filesystem-routes/page/routes.js

@@ -22,7 +22,7 @@ const file_1 = require("@shuvi/utils/file");
 const paths_1 = require("../../../paths");
 const EmptyComponnetPath = (0, paths_1.resolvePkgFile)('lib/node/features/filesystem-routes/page/EmptyPageComponent');
 function genRouteId(filepath) {
-    return (0, crypto_1.createHash)('md4').update(filepath).digest('hex').substr(0, 4);
+    return (0, crypto_1.createHash)('shake256').update(filepath).digest('hex').substr(0, 4);
 }
 /**
  * returns JSON string of INormalizedPageRouteConfig

package/lib/node/features/html-render/lib/getPageMiddleware.js

@@ -56,6 +56,12 @@ function createPageHandler(serverPluginContext) {
                 yield sendHtml(textResp.data, { req, res });
                 sendHtmlHookTrace.stop();
             }
+            else if ((0, shared_1.isResponse)(result)) {
+                const rawResp = result;
+                res.statusCode = rawResp.status;
+                res.statusMessage = rawResp.statusText;
+                res.end(rawResp.data);
+            }
             else {
                 // should never reach here
                 throw new Error('Unexpected reponse type from renderToHTML');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/platform-web",
-  "version": "1.0.48",
+  "version": "1.0.49",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -72,15 +72,15 @@
   },
   "dependencies": {
     "@next/react-refresh-utils": "12.1.6",
-    "@shuvi/error-overlay": "1.0.48",
-    "@shuvi/hook": "1.0.48",
-    "@shuvi/platform-shared": "1.0.48",
-    "@shuvi/router": "1.0.48",
-    "@shuvi/router-react": "1.0.48",
-    "@shuvi/runtime": "1.0.48",
-    "@shuvi/shared": "1.0.48",
-    "@shuvi/toolpack": "1.0.48",
-    "@shuvi/utils": "1.0.48",
+    "@shuvi/error-overlay": "1.0.49",
+    "@shuvi/hook": "1.0.49",
+    "@shuvi/platform-shared": "1.0.49",
+    "@shuvi/router": "1.0.49",
+    "@shuvi/router-react": "1.0.49",
+    "@shuvi/runtime": "1.0.49",
+    "@shuvi/shared": "1.0.49",
+    "@shuvi/toolpack": "1.0.49",
+    "@shuvi/utils": "1.0.49",
     "content-type": "1.0.4",
     "core-js": "3.6.5",
     "doura": "0.0.13",
@@ -98,7 +98,7 @@
     "whatwg-fetch": "3.0.0"
   },
   "peerDependencies": {
-    "@shuvi/service": "1.0.48"
+    "@shuvi/service": "1.0.49"
   },
   "devDependencies": {
     "@shuvi/service": "workspace:*",