@modern-js/server-core 3.11.0 → 3.11.2

package/dist/cjs/constants.js

@@ -54,12 +54,11 @@ var ServerTimings = /*#__PURE__*/ function(ServerTimings) {
 const SERVER_TIMING = 'Server-Timing';
 const X_RENDER_CACHE = 'x-render-cache';
 const X_MODERNJS_RENDER = 'x-modernjs-render';
-__webpack_require__.d(__webpack_exports__, {
-    ServerTimings: ()=>ServerTimings
-}, {
+__webpack_require__.d(__webpack_exports__, {}, {
     AGGRED_DIR: AGGRED_DIR,
     REPLACE_REG: REPLACE_REG,
     SERVER_TIMING: SERVER_TIMING,
+    ServerTimings: ServerTimings,
     X_MODERNJS_RENDER: X_MODERNJS_RENDER,
     X_RENDER_CACHE: X_RENDER_CACHE
 });

package/dist/cjs/helper.js

@@ -37,8 +37,8 @@ function getLoaderCtx(c) {
         return loaderContext;
     }
 }
-__webpack_require__.d(__webpack_exports__, {
-    getLoaderCtx: ()=>getLoaderCtx
+__webpack_require__.d(__webpack_exports__, {}, {
+    getLoaderCtx: getLoaderCtx
 });
 exports.getLoaderCtx = __webpack_exports__.getLoaderCtx;
 for(var __rspack_i in __webpack_exports__)if (-1 === [

package/dist/cjs/plugins/compat/hooks.js

@@ -65,10 +65,10 @@ function handleSetupResult(setupResult, api) {
         }
     });
 }
-__webpack_require__.d(__webpack_exports__, {
-    getHookRunners: ()=>getHookRunners,
-    handleSetupResult: ()=>handleSetupResult,
-    transformHookRunner: ()=>transformHookRunner
+__webpack_require__.d(__webpack_exports__, {}, {
+    getHookRunners: getHookRunners,
+    handleSetupResult: handleSetupResult,
+    transformHookRunner: transformHookRunner
 });
 exports.getHookRunners = __webpack_exports__.getHookRunners;
 exports.handleSetupResult = __webpack_exports__.handleSetupResult;

package/dist/cjs/plugins/render/index.js

@@ -82,8 +82,12 @@ var __webpack_exports__ = {};
                         handler: (0, _monitors__rspack_import_2.requestLatencyMiddleware)()
                     });
                     for (const route of pageRoutes){
-                        const { urlPath: originUrlPath } = route;
-                        const urlPath = originUrlPath.endsWith('/') ? `${originUrlPath}*` : `${originUrlPath}/*`;
+                        const urlPath = (0, _utils__rspack_import_1.getRoutePath)(route);
+                        if (route.isSSG && !urlPath.endsWith('/')) middlewares.push({
+                            name: 'ssg-trailing-slash-redirect',
+                            path: `${urlPath}/`,
+                            handler: async (c)=>c.redirect(`${urlPath}${new URL(c.req.url).search}`, 308)
+                        });
                         renderMiddlewares?.forEach((m)=>{
                             middlewares.push({
                                 name: m.name,

package/dist/cjs/plugins/render/render.js

@@ -70,8 +70,7 @@ var __webpack_exports__ = {};
         ];
         const router = new trie_router_namespaceObject.TrieRouter();
         for (const route of finalRoutes){
-            const { urlPath: originUrlPath } = route;
-            const urlPath = originUrlPath.endsWith('/') ? `${originUrlPath}*` : `${originUrlPath}/*`;
+            const urlPath = (0, index_js_namespaceObject.getRoutePath)(route);
             router.add('*', urlPath, route);
         }
         return router;

package/dist/cjs/plugins/render/utils.js

@@ -41,8 +41,8 @@ function createRequestHandlerConfig(userConfig) {
         enableAsyncEntry: source?.enableAsyncEntry
     };
 }
-__webpack_require__.d(__webpack_exports__, {
-    createRequestHandlerConfig: ()=>createRequestHandlerConfig
+__webpack_require__.d(__webpack_exports__, {}, {
+    createRequestHandlerConfig: createRequestHandlerConfig
 });
 exports.createRequestHandlerConfig = __webpack_exports__.createRequestHandlerConfig;
 for(var __rspack_i in __webpack_exports__)if (-1 === [

package/dist/cjs/plugins/route.js

@@ -50,7 +50,7 @@ const injectRoutePlugin = ()=>({
                 const pageRoutes = getPageRoutes(routes);
                 for (const route of pageRoutes){
                     const { urlPath: originUrlPath, entryName = constants_namespaceObject.MAIN_ENTRY_NAME } = route;
-                    const urlPath = originUrlPath.endsWith('/') ? `${originUrlPath}*` : `${originUrlPath}/*`;
+                    const urlPath = (0, index_js_namespaceObject.getRoutePath)(route);
                     middlewares.push({
                         name: 'inject-route-info',
                         path: urlPath,

package/dist/cjs/utils/entry.js

@@ -29,13 +29,20 @@ var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 const sortRoutes = (route1, route2)=>route2.urlPath.length - route1.urlPath.length;
 const uniqueKeyByRoute = (route)=>`${route.entryName}-${route.urlPath}`;
+const getRoutePath = ({ urlPath, isSSG })=>{
+    if (isSSG) return urlPath;
+    return urlPath.endsWith('/') ? `${urlPath}*` : `${urlPath}/*`;
+};
 __webpack_require__.d(__webpack_exports__, {}, {
+    getRoutePath: getRoutePath,
     sortRoutes: sortRoutes,
     uniqueKeyByRoute: uniqueKeyByRoute
 });
+exports.getRoutePath = __webpack_exports__.getRoutePath;
 exports.sortRoutes = __webpack_exports__.sortRoutes;
 exports.uniqueKeyByRoute = __webpack_exports__.uniqueKeyByRoute;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "getRoutePath",
     "sortRoutes",
     "uniqueKeyByRoute"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];

package/dist/cjs/utils/request.js

@@ -66,12 +66,12 @@ function parseCookie(req) {
     });
     return cookie;
 }
-__webpack_require__.d(__webpack_exports__, {
-    getHost: ()=>getHost,
-    getPathname: ()=>getPathname,
-    parseCookie: ()=>parseCookie,
-    parseHeaders: ()=>parseHeaders,
-    parseQuery: ()=>parseQuery
+__webpack_require__.d(__webpack_exports__, {}, {
+    getHost: getHost,
+    getPathname: getPathname,
+    parseCookie: parseCookie,
+    parseHeaders: parseHeaders,
+    parseQuery: parseQuery
 });
 exports.getHost = __webpack_exports__.getHost;
 exports.getPathname = __webpack_exports__.getPathname;

package/dist/cjs/utils/transformStream.js

@@ -54,9 +54,9 @@ function transformResponse(response, transformCb) {
         statusText: response.statusText
     });
 }
-__webpack_require__.d(__webpack_exports__, {
-    createTransformStream: ()=>createTransformStream,
-    transformResponse: ()=>transformResponse
+__webpack_require__.d(__webpack_exports__, {}, {
+    createTransformStream: createTransformStream,
+    transformResponse: transformResponse
 });
 exports.createTransformStream = __webpack_exports__.createTransformStream;
 exports.transformResponse = __webpack_exports__.transformResponse;

package/dist/cjs/utils/warmup.js

@@ -32,8 +32,8 @@ function warmup(bundles) {
         bundle && import(bundle).catch((_)=>{});
     });
 }
-__webpack_require__.d(__webpack_exports__, {
-    warmup: ()=>warmup
+__webpack_require__.d(__webpack_exports__, {}, {
+    warmup: warmup
 });
 exports.warmup = __webpack_exports__.warmup;
 for(var __rspack_i in __webpack_exports__)if (-1 === [

package/dist/esm/context.mjs

@@ -1,3 +1,3 @@
 import { createStorage } from "./utils/storage.mjs";
-const { run: run, useHonoContext: useHonoContext } = createStorage('@modern-js/server-core/hono-context');
+const { run, useHonoContext } = createStorage('@modern-js/server-core/hono-context');
 export { run, useHonoContext };

package/dist/esm/plugins/render/index.mjs

@@ -1,5 +1,5 @@
 import { getLoaderCtx } from "../../helper.mjs";
-import { sortRoutes } from "../../utils/index.mjs";
+import { getRoutePath, sortRoutes } from "../../utils/index.mjs";
 import { requestLatencyMiddleware } from "../monitors.mjs";
 export * from "./inject.mjs";
 const renderPlugin = ()=>({
@@ -14,8 +14,12 @@ const renderPlugin = ()=>({
                     handler: requestLatencyMiddleware()
                 });
                 for (const route of pageRoutes){
-                    const { urlPath: originUrlPath } = route;
-                    const urlPath = originUrlPath.endsWith('/') ? `${originUrlPath}*` : `${originUrlPath}/*`;
+                    const urlPath = getRoutePath(route);
+                    if (route.isSSG && !urlPath.endsWith('/')) middlewares.push({
+                        name: 'ssg-trailing-slash-redirect',
+                        path: `${urlPath}/`,
+                        handler: async (c)=>c.redirect(`${urlPath}${new URL(c.req.url).search}`, 308)
+                    });
                     renderMiddlewares?.forEach((m)=>{
                         middlewares.push({
                             name: m.name,

package/dist/esm/plugins/render/render.mjs

@@ -2,7 +2,7 @@ import { cutNameByHyphen } from "@modern-js/utils/universal";
 import { TrieRouter } from "hono/router/trie-router";
 import { getPath } from "hono/utils/url";
 import { X_MODERNJS_RENDER } from "../../constants.mjs";
-import { ErrorDigest, createErrorHtml, getRuntimeEnv, parseHeaders, parseQuery, sortRoutes, uniqueKeyByRoute } from "../../utils/index.mjs";
+import { ErrorDigest, createErrorHtml, getRoutePath, getRuntimeEnv, parseHeaders, parseQuery, sortRoutes, uniqueKeyByRoute } from "../../utils/index.mjs";
 import { csrRscRender } from "./csrRscRender.mjs";
 import { dataHandler } from "./dataHandler.mjs";
 import { renderRscHandler } from "./renderRscHandler.mjs";
@@ -22,8 +22,7 @@ function getRouter(routes) {
     ];
     const router = new TrieRouter();
     for (const route of finalRoutes){
-        const { urlPath: originUrlPath } = route;
-        const urlPath = originUrlPath.endsWith('/') ? `${originUrlPath}*` : `${originUrlPath}/*`;
+        const urlPath = getRoutePath(route);
         router.add('*', urlPath, route);
     }
     return router;

package/dist/esm/plugins/route.mjs

@@ -1,5 +1,5 @@
 import { MAIN_ENTRY_NAME } from "@modern-js/utils/universal/constants";
-import { sortRoutes } from "../utils/index.mjs";
+import { getRoutePath, sortRoutes } from "../utils/index.mjs";
 function injectRoute(route) {
     return async (c, next)=>{
         if (route && !c.get('route')) c.set('route', route);
@@ -18,7 +18,7 @@ const injectRoutePlugin = ()=>({
                 const pageRoutes = getPageRoutes(routes);
                 for (const route of pageRoutes){
                     const { urlPath: originUrlPath, entryName = MAIN_ENTRY_NAME } = route;
-                    const urlPath = originUrlPath.endsWith('/') ? `${originUrlPath}*` : `${originUrlPath}/*`;
+                    const urlPath = getRoutePath(route);
                     middlewares.push({
                         name: 'inject-route-info',
                         path: urlPath,

package/dist/esm/utils/entry.mjs

@@ -1,3 +1,7 @@
 const sortRoutes = (route1, route2)=>route2.urlPath.length - route1.urlPath.length;
 const uniqueKeyByRoute = (route)=>`${route.entryName}-${route.urlPath}`;
-export { sortRoutes, uniqueKeyByRoute };
+const getRoutePath = ({ urlPath, isSSG })=>{
+    if (isSSG) return urlPath;
+    return urlPath.endsWith('/') ? `${urlPath}*` : `${urlPath}/*`;
+};
+export { getRoutePath, sortRoutes, uniqueKeyByRoute };

package/dist/esm-node/context.mjs

@@ -1,4 +1,4 @@
 import "node:module";
 import { createStorage } from "./utils/storage.mjs";
-const { run: run, useHonoContext: useHonoContext } = createStorage('@modern-js/server-core/hono-context');
+const { run, useHonoContext } = createStorage('@modern-js/server-core/hono-context');
 export { run, useHonoContext };

package/dist/esm-node/plugins/render/index.mjs

@@ -1,6 +1,6 @@
 import "node:module";
 import { getLoaderCtx } from "../../helper.mjs";
-import { sortRoutes } from "../../utils/index.mjs";
+import { getRoutePath, sortRoutes } from "../../utils/index.mjs";
 import { requestLatencyMiddleware } from "../monitors.mjs";
 export * from "./inject.mjs";
 const renderPlugin = ()=>({
@@ -15,8 +15,12 @@ const renderPlugin = ()=>({
                     handler: requestLatencyMiddleware()
                 });
                 for (const route of pageRoutes){
-                    const { urlPath: originUrlPath } = route;
-                    const urlPath = originUrlPath.endsWith('/') ? `${originUrlPath}*` : `${originUrlPath}/*`;
+                    const urlPath = getRoutePath(route);
+                    if (route.isSSG && !urlPath.endsWith('/')) middlewares.push({
+                        name: 'ssg-trailing-slash-redirect',
+                        path: `${urlPath}/`,
+                        handler: async (c)=>c.redirect(`${urlPath}${new URL(c.req.url).search}`, 308)
+                    });
                     renderMiddlewares?.forEach((m)=>{
                         middlewares.push({
                             name: m.name,

package/dist/esm-node/plugins/render/render.mjs

@@ -3,7 +3,7 @@ import { cutNameByHyphen } from "@modern-js/utils/universal";
 import { TrieRouter } from "hono/router/trie-router";
 import { getPath } from "hono/utils/url";
 import { X_MODERNJS_RENDER } from "../../constants.mjs";
-import { ErrorDigest, createErrorHtml, getRuntimeEnv, parseHeaders, parseQuery, sortRoutes, uniqueKeyByRoute } from "../../utils/index.mjs";
+import { ErrorDigest, createErrorHtml, getRoutePath, getRuntimeEnv, parseHeaders, parseQuery, sortRoutes, uniqueKeyByRoute } from "../../utils/index.mjs";
 import { csrRscRender } from "./csrRscRender.mjs";
 import { dataHandler } from "./dataHandler.mjs";
 import { renderRscHandler } from "./renderRscHandler.mjs";
@@ -25,8 +25,7 @@ function getRouter(routes) {
     ];
     const router = new TrieRouter();
     for (const route of finalRoutes){
-        const { urlPath: originUrlPath } = route;
-        const urlPath = originUrlPath.endsWith('/') ? `${originUrlPath}*` : `${originUrlPath}/*`;
+        const urlPath = getRoutePath(route);
         router.add('*', urlPath, route);
     }
     return router;

package/dist/esm-node/plugins/route.mjs

@@ -1,6 +1,6 @@
 import "node:module";
 import { MAIN_ENTRY_NAME } from "@modern-js/utils/universal/constants";
-import { sortRoutes } from "../utils/index.mjs";
+import { getRoutePath, sortRoutes } from "../utils/index.mjs";
 function injectRoute(route) {
     return async (c, next)=>{
         if (route && !c.get('route')) c.set('route', route);
@@ -19,7 +19,7 @@ const injectRoutePlugin = ()=>({
                 const pageRoutes = getPageRoutes(routes);
                 for (const route of pageRoutes){
                     const { urlPath: originUrlPath, entryName = MAIN_ENTRY_NAME } = route;
-                    const urlPath = originUrlPath.endsWith('/') ? `${originUrlPath}*` : `${originUrlPath}/*`;
+                    const urlPath = getRoutePath(route);
                     middlewares.push({
                         name: 'inject-route-info',
                         path: urlPath,

package/dist/esm-node/utils/entry.mjs

@@ -1,4 +1,8 @@
 import "node:module";
 const sortRoutes = (route1, route2)=>route2.urlPath.length - route1.urlPath.length;
 const uniqueKeyByRoute = (route)=>`${route.entryName}-${route.urlPath}`;
-export { sortRoutes, uniqueKeyByRoute };
+const getRoutePath = ({ urlPath, isSSG })=>{
+    if (isSSG) return urlPath;
+    return urlPath.endsWith('/') ? `${urlPath}*` : `${urlPath}/*`;
+};
+export { getRoutePath, sortRoutes, uniqueKeyByRoute };

package/dist/types/utils/entry.d.ts

@@ -1,3 +1,4 @@
 import type { ServerRoute } from '@modern-js/types';
 export declare const sortRoutes: (route1: ServerRoute, route2: ServerRoute) => number;
 export declare const uniqueKeyByRoute: (route: ServerRoute) => string;
+export declare const getRoutePath: ({ urlPath, isSSG }: ServerRoute) => string;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.11.0",
+  "version": "3.11.2",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
   "exports": {
@@ -71,9 +71,9 @@
     "flatted": "^3.4.4",
     "hono": "^4.11.7",
     "ts-deepmerge": "8.0.0",
-    "@modern-js/plugin": "3.11.0",
-    "@modern-js/runtime-utils": "3.11.0",
-    "@modern-js/utils": "3.11.0"
+    "@modern-js/plugin": "3.11.2",
+    "@modern-js/runtime-utils": "3.11.2",
+    "@modern-js/utils": "3.11.2"
   },
   "devDependencies": {
     "@types/cloneable-readable": "^2.0.3",
@@ -81,9 +81,9 @@
     "@types/node": "^20",
     "http-proxy-middleware": "^2.0.11",
     "typescript": "^5",
-    "@modern-js/rslib": "3.11.0",
-    "@modern-js/types": "3.11.0",
-    "@scripts/rstest-config": "2.66.4"
+    "@modern-js/rslib": "3.11.2",
+    "@modern-js/types": "3.11.2",
+    "@scripts/rstest-config": "2.66.6"
   },
   "sideEffects": false,
   "publishConfig": {