@shuvi/platform-web 1.0.1 → 1.0.3

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

@@ -15,6 +15,7 @@ import pageLoaders from '@shuvi/app/files/page-loaders';
 import { historyMode } from '@shuvi/app/files/routerConfig';
 import { SHUVI_ERROR } from '@shuvi/shared/lib/constants';
 import { serializeServerError } from '../helper/serializeServerError';
+import isThirdSite from '../helper/isThirdSite';
 let app;
 export const createApp = ({ routes, appData, appComponent }) => {
     // app is a singleton in client side
@@ -98,7 +99,16 @@ export const createApp = ({ routes, appData, appComponent }) => {
         }
         catch (error) {
             if (isRedirect(error)) {
-                next(error.headers.get('Location'));
+                const location = error.headers.get('Location');
+                if (isThirdSite(location)) {
+                    window.location.replace(location);
+                }
+                else {
+                    next({
+                        path: location,
+                        replace: true
+                    });
+                }
                 return;
             }
             if (isResponse(error) && error.status >= 400 && error.status < 600) {

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

@@ -12,7 +12,7 @@ import { getRoutes, app as AppComponent } from '@shuvi/app/core/platform';
 import { runLoaders, getRouteMatchesWithInvalidLoader, isResponse, isRedirect } from '@shuvi/platform-shared/shared';
 import pageLoaders from '@shuvi/app/files/page-loaders';
 import application from '@shuvi/platform-shared/shuvi-app/application';
-import { createRouter, createMemoryHistory } from '@shuvi/router';
+import { createRouter, createMemoryHistory, pathToString } from '@shuvi/router';
 import logger from '@shuvi/utils/lib/logger';
 import { serializeServerError } from '../helper/serializeServerError';
 export const createApp = options => {
@@ -39,7 +39,17 @@ export const createApp = options => {
             }
             catch (error) {
                 if (isRedirect(error)) {
-                    next(error.headers.get('Location'));
+                    const location = error.headers.get('Location');
+                    const status = error.status;
+                    next({
+                        path: pathToString(to),
+                        replace: true,
+                        skipGuards: true,
+                        state: {
+                            location,
+                            status
+                        }
+                    });
                     return;
                 }
                 if (isResponse(error) && error.status >= 400 && error.status < 600) {

package/esm/shuvi-app/helper/isThirdSite.d.ts

@@ -0,0 +1,2 @@
+declare function isThirdSite(url: string): boolean;
+export default isThirdSite;

package/esm/shuvi-app/helper/isThirdSite.js

@@ -0,0 +1,5 @@
+const THIRD_SITE_REG = /^http(s?)\:\/\//;
+function isThirdSite(url) {
+    return THIRD_SITE_REG.test(url);
+}
+export default isThirdSite;

package/esm/shuvi-app/react/AppContainer.jsx

@@ -12,11 +12,11 @@ function ErrorGuard({ children = null }) {
     return <>{children}</>;
 }
 export default function AppContainer({ app, children }) {
-    return (<ErrorBoundary>
-      <AppProvider app={app}>
+    return (<AppProvider app={app}>
+      <ErrorBoundary>
         <Provider store={app.store}>
           <ErrorGuard>{children}</ErrorGuard>
         </Provider>
-      </AppProvider>
-    </ErrorBoundary>);
+      </ErrorBoundary>
+    </AppProvider>);
 }

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

@@ -17,6 +17,7 @@ import Loadable, { LoadableContext } from '../loadable';
 import AppContainer from '../AppContainer';
 import { Head } from '../head';
 import { serializeServerError } from '../../helper/serializeServerError';
+import isThirdSite from '../../helper/isThirdSite';
 export class ReactServerView {
     constructor() {
         this.renderApp = ({ req, app, manifest }) => __awaiter(this, void 0, void 0, function* () {
@@ -24,13 +25,16 @@ export class ReactServerView {
             const { router, appComponent: AppComponent, setError: setAppError } = app;
             yield router.ready;
             // todo: move these into renderer
-            let { pathname, matches, redirected } = router.current;
+            let { matches, redirected, state, pathname } = router.current;
             // handler no matches
             if (!matches.length) {
                 setAppError(SHUVI_ERROR.PAGE_NOT_FOUND);
             }
             if (redirected) {
-                return redirect(pathname);
+                const { location, status } = state;
+                return redirect(isThirdSite(location)
+                    ? location
+                    : router.resolve(location, pathname).href, status);
             }
             const loadableModules = [];
             let htmlContent = undefined;

package/lib/node/features/custom-server/server.js

@@ -33,5 +33,9 @@ exports.default = (0, service_1.createServerPlugin)({
     modifyHtml: (document, context) => __awaiter(void 0, void 0, void 0, function* () {
         var _a, _b, _c;
         yield ((_c = (_b = (_a = resources_1.default.server) === null || _a === void 0 ? void 0 : _a.server) === null || _b === void 0 ? void 0 : _b.modifyHtml) === null || _c === void 0 ? void 0 : _c.call(_b, document, context));
+    }),
+    sendHtml: (originalSendHtml) => __awaiter(void 0, void 0, void 0, function* () {
+        var _d, _e;
+        return (((_e = (_d = resources_1.default.server.server) === null || _d === void 0 ? void 0 : _d.sendHtml) === null || _e === void 0 ? void 0 : _e.call(_d, originalSendHtml)) || originalSendHtml);
     })
 });

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

@@ -14,7 +14,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPlugin = exports.getPageMiddleware = void 0;
 const service_1 = require("@shuvi/service");
-const config_1 = require("@shuvi/toolpack/lib/webpack/config");
 const copy_file_plugin_1 = require("@shuvi/toolpack/lib/webpack/plugins/copy-file-plugin");
 const shared_1 = require("../../../shared");
 const paths_1 = require("../../paths");
@@ -89,13 +88,11 @@ const getPlugin = (platformContext) => {
             return chain;
         },
         addExtraTarget: ({ createConfig }, context) => {
-            const serverWebpackHelpers = (0, config_1.webpackHelpers)();
             const serverChain = createConfig({
                 name: shared_1.BUNDLER_TARGET_SERVER,
                 node: true,
                 entry: getServerEntry(),
-                outputDir: shared_1.SERVER_OUTPUT_DIR,
-                webpackHelpers: serverWebpackHelpers
+                outputDir: shared_1.SERVER_OUTPUT_DIR
             });
             return {
                 name: shared_1.BUNDLER_TARGET_SERVER,

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

@@ -14,6 +14,11 @@ const utils_1 = require("@shuvi/service/lib/server/utils");
 const shared_1 = require("@shuvi/platform-shared/shared");
 const renderToHTML_1 = require("./renderToHTML");
 function createPageHandler(serverPluginContext) {
+    const wrappedSendHtml = (html, { req, res }) => __awaiter(this, void 0, void 0, function* () {
+        (0, utils_1.sendHTML)(req, res, html);
+    });
+    let sendHtml;
+    let pendingSendHtml;
     return function (req, res) {
         return __awaiter(this, void 0, void 0, function* () {
             const result = yield (0, renderToHTML_1.renderToHTML)({
@@ -30,7 +35,14 @@ function createPageHandler(serverPluginContext) {
             else if ((0, shared_1.isText)(result)) {
                 const textResp = result;
                 res.statusCode = textResp.status;
-                (0, utils_1.sendHTML)(req, res, textResp.data);
+                if (!sendHtml) {
+                    if (!pendingSendHtml) {
+                        pendingSendHtml =
+                            serverPluginContext.serverPluginRunner.sendHtml(wrappedSendHtml);
+                    }
+                    sendHtml = yield pendingSendHtml;
+                }
+                yield sendHtml(textResp.data, { req, res });
             }
             else {
                 // shuold never reach here
@@ -43,10 +55,15 @@ function getPageMiddleware(api) {
     return __awaiter(this, void 0, void 0, function* () {
         const defaultPageHandler = createPageHandler(api);
         let pageHandler;
+        let pendingPageHandler;
         return function (req, res, next) {
             return __awaiter(this, void 0, void 0, function* () {
                 if (!pageHandler) {
-                    pageHandler = yield api.serverPluginRunner.handlePageRequest(defaultPageHandler);
+                    if (!pendingPageHandler) {
+                        pendingPageHandler =
+                            api.serverPluginRunner.handlePageRequest(defaultPageHandler);
+                    }
+                    pageHandler = yield pendingPageHandler;
                 }
                 try {
                     yield pageHandler(req, res);

package/lib/node/features/html-render/serverHooks.d.ts

@@ -7,9 +7,15 @@ export interface ModifyHtmlContext {
     req: ShuviRequest;
     appContext: IAppContext;
 }
-export declare type IHandlePageRequest = (req: IncomingMessage, res: ServerResponse) => any;
+export declare type IHandlePageRequest = (req: IncomingMessage, res: ServerResponse) => Promise<void>;
+export declare type RequestContext = {
+    req: IncomingMessage;
+    res: ServerResponse;
+};
+export declare type ISendHtml = (html: string, requestContext: RequestContext) => Promise<void>;
 export declare const extendedHooks: {
     getPageData: import("@shuvi/hook").AsyncParallelHook<void, IAppContext, Record<string, unknown>>;
-    handlePageRequest: import("@shuvi/hook").SyncWaterfallHook<IHandlePageRequest, void>;
+    handlePageRequest: import("@shuvi/hook").AsyncSeriesWaterfallHook<IHandlePageRequest, void>;
     modifyHtml: import("@shuvi/hook").AsyncSeriesHook<IHtmlDocument, ModifyHtmlContext, void>;
+    sendHtml: import("@shuvi/hook").AsyncSeriesWaterfallHook<ISendHtml, void>;
 };

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

@@ -3,10 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.extendedHooks = void 0;
 const hook_1 = require("@shuvi/hook");
 const getPageData = (0, hook_1.createAsyncParallelHook)();
-const handlePageRequest = (0, hook_1.createSyncWaterfallHook)();
+const handlePageRequest = (0, hook_1.createAsyncSeriesWaterfallHook)();
 const modifyHtml = (0, hook_1.createAsyncSeriesHook)();
+const sendHtml = (0, hook_1.createAsyncSeriesWaterfallHook)();
 exports.extendedHooks = {
     getPageData,
     handlePageRequest,
-    modifyHtml
+    modifyHtml,
+    sendHtml
 };

package/lib/node/shuvi-runtime-server.d.ts

@@ -7,6 +7,7 @@ declare global {
             getPageData: typeof extendedHooks.getPageData;
             handlePageRequest: typeof extendedHooks.handlePageRequest;
             modifyHtml: typeof extendedHooks.modifyHtml;
+            sendHtml: typeof extendedHooks.sendHtml;
         }
     }
 }
@@ -18,9 +19,11 @@ export declare type ShuviApiHandler = IApiRequestHandler;
 export declare type GetPageDataFunction = RemoveLast<ServerPluginConstructor['getPageData']>;
 export declare type HandlePageRequestFunction = RemoveLast<ServerPluginConstructor['handlePageRequest']>;
 export declare type ModifyHtmlFunction = RemoveLast<ServerPluginConstructor['modifyHtml']>;
+export declare type SendHtmlFunction = RemoveLast<ServerPluginConstructor['sendHtml']>;
 export interface IServerModule {
     getPageData?: GetPageDataFunction;
     handlePageRequest?: HandlePageRequestFunction;
     modifyHtml?: ModifyHtmlFunction;
+    sendHtml?: SendHtmlFunction;
 }
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/platform-web",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -72,18 +72,17 @@
   },
   "dependencies": {
     "@next/react-refresh-utils": "12.1.6",
-    "@shuvi/error-overlay": "1.0.1",
-    "@shuvi/hook": "1.0.1",
-    "@shuvi/platform-shared": "1.0.1",
+    "@shuvi/error-overlay": "1.0.3",
+    "@shuvi/hook": "1.0.3",
+    "@shuvi/platform-shared": "1.0.3",
     "@shuvi/redox": "0.0.7",
     "@shuvi/redox-react": "0.0.7",
-    "@shuvi/router": "1.0.1",
-    "@shuvi/router-react": "1.0.1",
-    "@shuvi/runtime": "1.0.1",
-    "@shuvi/service": "1.0.1",
-    "@shuvi/shared": "1.0.1",
-    "@shuvi/toolpack": "1.0.1",
-    "@shuvi/utils": "1.0.1",
+    "@shuvi/router": "1.0.3",
+    "@shuvi/router-react": "1.0.3",
+    "@shuvi/runtime": "1.0.3",
+    "@shuvi/shared": "1.0.3",
+    "@shuvi/toolpack": "1.0.3",
+    "@shuvi/utils": "1.0.3",
     "content-type": "1.0.4",
     "core-js": "3.6.5",
     "ejs": "3.1.5",
@@ -99,9 +98,10 @@
     "whatwg-fetch": "3.0.0"
   },
   "peerDependencies": {
-    "@shuvi/service": "1.0.1"
+    "@shuvi/service": "1.0.3"
   },
   "devDependencies": {
+    "@shuvi/service": "workspace:*",
     "@testing-library/react": "^13.2.0",
     "@types/content-type": "^1.1.5",
     "@types/ejs": "^3.1.0",