@shuvi/platform-web 2.0.0-dev.31 → 2.0.0-dev.33

package/esm/shared/appTypes.d.ts

@@ -11,6 +11,7 @@ export interface CreateAppServer {
         req: ShuviRequest;
         ssr: boolean;
         basename: string;
+        strictTrailingSlash?: boolean;
     }): InternalApplication;
 }
 export interface CreateAppClient {

package/esm/shared/configTypes.d.ts

@@ -1,6 +1,13 @@
 import { IRouterHistoryMode, IPageRouteConfig } from '@shuvi/platform-shared/shared';
 export interface IRouterConfig {
     history: IRouterHistoryMode | 'auto';
+    /**
+     * When true, path matching treats trailing slashes as significant. A request
+     * whose pathname differs only by a trailing slash from a real route is
+     * redirected (308) to the canonical URL instead of rendering the route.
+     * Defaults to false for backward compatibility.
+     */
+    strictTrailingSlash?: boolean;
 }
 export interface PlatformWebCustomConfig {
     ssr: boolean;

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

@@ -23,7 +23,7 @@ export const createApp = ({ routes, appData, appComponent }) => {
     if (app) {
         return app;
     }
-    const { appState, ssr, basename } = appData;
+    const { appState, ssr, basename, strictTrailingSlash = false } = appData;
     let history;
     if (historyMode === 'hash') {
         history = createHashHistory({ basename });
@@ -33,7 +33,8 @@ export const createApp = ({ routes, appData, appComponent }) => {
     }
     const router = createRouter({
         history,
-        routes: getRoutes(routes)
+        routes: getRoutes(routes),
+        strictTrailingSlash
     });
     app = application({
         initialState: appState,

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

@@ -17,7 +17,7 @@ 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, basename } = options;
+    const { req, ssr, basename, strictTrailingSlash = false } = options;
     const history = createMemoryHistory({
         initialEntries: [(req && req.url) || '/'],
         initialIndex: 0,
@@ -25,7 +25,8 @@ export const createApp = options => {
     });
     const router = createRouter({
         history,
-        routes: getRoutes(routes)
+        routes: getRoutes(routes),
+        strictTrailingSlash
     });
     let app;
     if (ssr) {

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

@@ -54,7 +54,13 @@ export class ReactServerView {
                         : router.resolve(location, pathname).href, status);
                 }
                 // handle router internal redirect
-                return redirect(router.resolve(router.current).href);
+                // handle router internal redirect. A `status` carried in `state` (e.g.
+                // from strict trailing-slash routing) takes precedence; otherwise fall
+                // back to 302 to preserve existing behavior for `route.redirect`.
+                const internalStatus = state && typeof state.status === 'number'
+                    ? state.status
+                    : 302;
+                return redirect(router.resolve(router.current).href, internalStatus);
             }
             const loadableModules = [];
             let htmlContent = undefined;

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

@@ -19,10 +19,12 @@ const renderer_1 = require("./renderer");
 const AppConfigManager_1 = __importDefault(require("../../setup-app-config/AppConfigManager"));
 function renderToHTML(_a) {
     return __awaiter(this, arguments, void 0, function* ({ req, serverPluginContext }) {
+        var _b;
         let result;
         const renderer = new renderer_1.Renderer({ serverPluginContext });
-        const { config: { ssr } } = serverPluginContext;
+        const { config: { ssr, router } } = serverPluginContext;
         const { basename } = AppConfigManager_1.default.getAppConfig(req).router;
+        const strictTrailingSlash = (_b = router === null || router === void 0 ? void 0 : router.strictTrailingSlash) !== null && _b !== void 0 ? _b : false;
         const { serverCreateAppTrace } = req._traces;
         const { application } = resources_1.default.server;
         const app = serverCreateAppTrace
@@ -32,7 +34,8 @@ function renderToHTML(_a) {
             .traceFn(() => application.createApp({
             req,
             ssr,
-            basename
+            basename,
+            strictTrailingSlash
         }));
         try {
             yield serverCreateAppTrace

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, basename: router.basename, runtimeConfig: (0, shuvi_singleton_runtimeConfig_1.getPublicRuntimeConfig)() || {} });
+            const appData = Object.assign(Object.assign({}, result.appData), { ssr: true, appState: store.getState(), pageData, basename: router.basename, strictTrailingSlash: router.strictTrailingSlash, runtimeConfig: (0, shuvi_singleton_runtimeConfig_1.getPublicRuntimeConfig)() || {} });
             const document = {
                 htmlAttrs: Object.assign({}, result.htmlAttrs),
                 headTags: [

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

@@ -88,7 +88,9 @@ class OnDemandRouteManager {
     ensureRoutes(pathname, req) {
         return __awaiter(this, void 0, void 0, function* () {
             const { basename } = AppConfigManager_1.default.getAppConfig(req).router;
-            const matchedRoutes = (0, router_1.matchRoutes)(resources_1.default.server.pageRoutes, pathname, (0, utils_1.normalizeBase)(basename)) || [];
+            const { strictTrailingSlash = false } = this._serverPluginContext.config.router ||
+                {};
+            const matchedRoutes = (0, router_1.matchRoutes)(resources_1.default.server.pageRoutes, pathname, (0, utils_1.normalizeBase)(basename), { strict: strictTrailingSlash }) || [];
             const modulesToActivate = matchedRoutes
                 .map(({ route: { __componentRawRequest__ } }) => __componentRawRequest__)
                 .filter(Boolean);

package/lib/shared/appTypes.d.ts

@@ -11,6 +11,7 @@ export interface CreateAppServer {
         req: ShuviRequest;
         ssr: boolean;
         basename: string;
+        strictTrailingSlash?: boolean;
     }): InternalApplication;
 }
 export interface CreateAppClient {

package/lib/shared/configTypes.d.ts

@@ -1,6 +1,13 @@
 import { IRouterHistoryMode, IPageRouteConfig } from '@shuvi/platform-shared/shared';
 export interface IRouterConfig {
     history: IRouterHistoryMode | 'auto';
+    /**
+     * When true, path matching treats trailing slashes as significant. A request
+     * whose pathname differs only by a trailing slash from a real route is
+     * redirected (308) to the canonical URL instead of rendering the route.
+     * Defaults to false for backward compatibility.
+     */
+    strictTrailingSlash?: boolean;
 }
 export interface PlatformWebCustomConfig {
     ssr: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/platform-web",
-  "version": "2.0.0-dev.31",
+  "version": "2.0.0-dev.33",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -72,15 +72,15 @@
   },
   "dependencies": {
     "@rspack/plugin-react-refresh": "^1.4.3",
-    "@shuvi/error-overlay": "2.0.0-dev.31",
-    "@shuvi/hook": "2.0.0-dev.31",
-    "@shuvi/platform-shared": "2.0.0-dev.31",
-    "@shuvi/router": "2.0.0-dev.31",
-    "@shuvi/router-react": "2.0.0-dev.31",
-    "@shuvi/runtime": "2.0.0-dev.31",
-    "@shuvi/shared": "2.0.0-dev.31",
-    "@shuvi/toolpack": "2.0.0-dev.31",
-    "@shuvi/utils": "2.0.0-dev.31",
+    "@shuvi/error-overlay": "2.0.0-dev.33",
+    "@shuvi/hook": "2.0.0-dev.33",
+    "@shuvi/platform-shared": "2.0.0-dev.33",
+    "@shuvi/router": "2.0.0-dev.33",
+    "@shuvi/router-react": "2.0.0-dev.33",
+    "@shuvi/runtime": "2.0.0-dev.33",
+    "@shuvi/shared": "2.0.0-dev.33",
+    "@shuvi/toolpack": "2.0.0-dev.33",
+    "@shuvi/utils": "2.0.0-dev.33",
     "content-type": "1.0.4",
     "core-js": "3.6.5",
     "doura": "0.0.13",
@@ -98,10 +98,10 @@
     "whatwg-fetch": "3.0.0"
   },
   "peerDependencies": {
-    "@shuvi/service": "2.0.0-dev.31"
+    "@shuvi/service": "2.0.0-dev.33"
   },
   "devDependencies": {
-    "@shuvi/service": "2.0.0-dev.31",
+    "@shuvi/service": "2.0.0-dev.33",
     "@testing-library/react": "^13.2.0",
     "@types/content-type": "^1.1.5",
     "@types/ejs": "^3.1.0",