@shuvi/platform-web 1.0.44 → 1.0.45

package/esm/shared/appTypes.d.ts

@@ -10,6 +10,7 @@ export interface CreateAppServer {
     (options: {
         req: ShuviRequest;
         ssr: boolean;
+        basename: string;
     }): InternalApplication;
 }
 export interface CreateAppClient {

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

@@ -23,13 +23,13 @@ export const createApp = ({ routes, appData, appComponent }) => {
     if (app) {
         return app;
     }
-    const { appState, ssr } = appData;
+    const { appState, ssr, basename } = appData;
     let history;
     if (historyMode === 'hash') {
-        history = createHashHistory();
+        history = createHashHistory({ basename });
     }
     else {
-        history = createBrowserHistory();
+        history = createBrowserHistory({ basename });
     }
     const router = createRouter({
         history,

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

@@ -17,10 +17,11 @@ import logger from '@shuvi/utils/logger';
 import { serializeServerError } from '../helper/serializeServerError';
 const { SHUVI_SERVER_RUN_LOADERS } = SERVER_CREATE_APP.events;
 export const createApp = options => {
-    const { req, ssr } = options;
+    const { req, ssr, basename } = options;
     const history = createMemoryHistory({
         initialEntries: [(req && req.url) || '/'],
-        initialIndex: 0
+        initialIndex: 0,
+        basename
     });
     const router = createRouter({
         history,

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

@@ -42,7 +42,7 @@ export class ReactServerView {
                         : router.resolve(location, pathname).href, status);
                 }
                 // handle router internal redirect
-                return redirect(pathname);
+                return redirect(router.resolve(router.current).href);
             }
             const loadableModules = [];
             let htmlContent = undefined;

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

@@ -20,6 +20,7 @@ function renderToHTML({ req, serverPluginContext }) {
     return __awaiter(this, void 0, void 0, function* () {
         let result;
         const renderer = new renderer_1.Renderer({ serverPluginContext });
+        const { config: { ssr }, appConfig: { router: { basename } } } = serverPluginContext;
         const { serverCreateAppTrace } = req._traces;
         const { application } = resources_1.default.server;
         const app = serverCreateAppTrace
@@ -28,7 +29,8 @@ function renderToHTML({ req, serverPluginContext }) {
         })
             .traceFn(() => application.createApp({
             req,
-            ssr: serverPluginContext.config.ssr
+            ssr,
+            basename
         }));
         try {
             yield serverCreateAppTrace
@@ -39,7 +41,7 @@ function renderToHTML({ req, serverPluginContext }) {
             result = yield renderer.renderView({
                 req,
                 app: app.getPublicAPI(),
-                ssr: serverPluginContext.config.ssr
+                ssr
             });
         }
         finally {

package/lib/node/features/html-render/lib/renderer/spa.js

@@ -5,9 +5,11 @@ const base_1 = require("./base");
 class SpaRenderer extends base_1.BaseRenderer {
     renderDocument({ req, app }) {
         const assets = this._getMainAssetTags(req);
+        const { router: { basename } } = this._serverPluginContext.appConfig;
         const appData = {
             ssr: false,
-            pageData: {}
+            pageData: {},
+            basename
         };
         const document = {
             htmlAttrs: {},

package/lib/node/features/html-render/lib/renderer/ssr.js

@@ -40,7 +40,7 @@ class SsrRenderer extends base_1.BaseRenderer {
                 Object.assign(acc, data);
                 return acc;
             }, {});
-            const appData = Object.assign(Object.assign({}, result.appData), { ssr: true, appState: store.getState(), pageData });
+            const appData = Object.assign(Object.assign({}, result.appData), { ssr: true, appState: store.getState(), pageData, basename: router.basename });
             appData.runtimeConfig = (0, shuvi_singleton_runtimeConfig_1.getPublicRuntimeConfig)() || {};
             const document = {
                 htmlAttrs: Object.assign({}, result.htmlAttrs),

package/lib/node/features/on-demand-compile-page/onDemandRouteManager.js

@@ -13,6 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const router_1 = require("@shuvi/router");
+const utils_1 = require("@shuvi/router/lib/utils");
 const resources_1 = __importDefault(require("@shuvi/service/lib/resources"));
 const module_replace_plugin_1 = __importDefault(require("@shuvi/toolpack/lib/webpack/plugins/module-replace-plugin"));
 function acceptsHtml(header, { htmlAcceptHeaders = ['text/html', '*/*'] } = {}) {
@@ -85,7 +86,8 @@ class OnDemandRouteManager {
     }
     ensureRoutes(pathname) {
         return __awaiter(this, void 0, void 0, function* () {
-            const matchedRoutes = (0, router_1.matchRoutes)(resources_1.default.server.pageRoutes, pathname) || [];
+            const { router: { basename } } = this._serverPluginContext.appConfig;
+            const matchedRoutes = (0, router_1.matchRoutes)(resources_1.default.server.pageRoutes, pathname, (0, utils_1.normalizeBase)(basename)) || [];
             const modulesToActivate = matchedRoutes
                 .map(({ route: { __componentRawRequest__ } }) => __componentRawRequest__)
                 .filter(Boolean);

package/lib/node/shuvi-type-extensions-node.d.ts

@@ -6,6 +6,9 @@ import { IServerModule } from './shuvi-runtime-server';
 import { addRoutes, addMiddlewareRoutes, addApiRoutes } from './features/filesystem-routes/hooks';
 export {};
 declare module '@shuvi/service/lib/resources' {
+    interface IGetRoutes {
+        (routes: IPageRouteRecord[]): IPageRouteRecord[];
+    }
     interface IResources {
         server: {
             server: IServerModule;
@@ -16,6 +19,7 @@ declare module '@shuvi/service/lib/resources' {
                 createApp: CreateAppServer;
             };
             view: IViewServer;
+            getRoutes: IGetRoutes;
         };
         documentPath: string;
         clientManifest: IManifest;

package/lib/shared/appTypes.d.ts

@@ -10,6 +10,7 @@ export interface CreateAppServer {
     (options: {
         req: ShuviRequest;
         ssr: boolean;
+        basename: string;
     }): InternalApplication;
 }
 export interface CreateAppClient {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/platform-web",
-  "version": "1.0.44",
+  "version": "1.0.45",
   "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.44",
-    "@shuvi/hook": "1.0.44",
-    "@shuvi/platform-shared": "1.0.44",
-    "@shuvi/router": "1.0.44",
-    "@shuvi/router-react": "1.0.44",
-    "@shuvi/runtime": "1.0.44",
-    "@shuvi/shared": "1.0.44",
-    "@shuvi/toolpack": "1.0.44",
-    "@shuvi/utils": "1.0.44",
+    "@shuvi/error-overlay": "1.0.45",
+    "@shuvi/hook": "1.0.45",
+    "@shuvi/platform-shared": "1.0.45",
+    "@shuvi/router": "1.0.45",
+    "@shuvi/router-react": "1.0.45",
+    "@shuvi/runtime": "1.0.45",
+    "@shuvi/shared": "1.0.45",
+    "@shuvi/toolpack": "1.0.45",
+    "@shuvi/utils": "1.0.45",
     "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.44"
+    "@shuvi/service": "1.0.45"
   },
   "devDependencies": {
     "@shuvi/service": "workspace:*",