@modern-js/server-core 2.63.5 → 2.63.7

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

@@ -57,6 +57,7 @@ class CustomServer {
         const rewriteRoute = routes.find((route) => route.entryName === current);
         if (rewriteRoute) {
           c.set("matchPathname", rewriteRoute.urlPath);
+          c.set("matchEntryName", current);
         }
       }
       if (c.finalized) {

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

@@ -92,6 +92,7 @@ function createRenderHandler(render) {
     const locals = c.get("locals");
     const metrics = c.get("metrics");
     const matchPathname = c.get("matchPathname");
+    const matchEntryName = c.get("matchEntryName");
     const loaderContext = (0, import_helper.getLoaderCtx)(c);
     const request = c.req.raw;
     const nodeReq = (_c_env_node = c.env.node) === null || _c_env_node === void 0 ? void 0 : _c_env_node.req;
@@ -105,7 +106,8 @@ function createRenderHandler(render) {
       serverManifest,
       loaderContext,
       locals,
-      matchPathname
+      matchPathname,
+      matchEntryName
     });
     const { body, status, headers } = res;
     const headersData = {};

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

@@ -61,10 +61,16 @@ function getRouter(routes) {
   }
   return router;
 }
-function matchRoute(router, pathname) {
+function matchRoute(router, pathname, entryName) {
   const matched = router.match("*", pathname);
-  const result = matched[0][0];
-  return result || [];
+  if (entryName && matched[0].length > 1) {
+    const matches = matched[0];
+    const result = matches.find(([route]) => route.entryName === entryName);
+    return result || [];
+  } else {
+    const result = matched[0][0];
+    return result || [];
+  }
 }
 function getHeadersWithoutCookie(headers) {
   const _headers = {
@@ -76,9 +82,9 @@ function getHeadersWithoutCookie(headers) {
 }
 async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig, forceCSR, config, onFallback: onFallbackFn }) {
   const router = getRouter(routes);
-  return async (req, { logger, reporter, metrics, monitors, nodeReq, templates, serverManifest, locals, matchPathname, loaderContext }) => {
+  return async (req, { logger, reporter, metrics, monitors, nodeReq, templates, serverManifest, locals, matchEntryName, matchPathname, loaderContext }) => {
     const forMatchpathname = matchPathname !== null && matchPathname !== void 0 ? matchPathname : (0, import_utils2.getPathname)(req);
-    const [routeInfo, params] = matchRoute(router, forMatchpathname);
+    const [routeInfo, params] = matchRoute(router, forMatchpathname, matchEntryName);
     const framework = metaName || "modern-js";
     const fallbackHeader = `x-${(0, import_universal.cutNameByHyphen)(framework)}-ssr-fallback`;
     let fallbackReason = null;

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

@@ -23,9 +23,9 @@ __export(ssrCache_exports, {
 });
 module.exports = __toCommonJS(ssrCache_exports);
 var import_storer = require("@modern-js/runtime-utils/storer");
-var import_utils = require("@modern-js/utils");
 var import_constants = require("../../constants");
-var import_utils2 = require("../../utils");
+var import_utils = require("../../utils");
+const removeTailSlash = (s) => s.replace(/\/+$/, "");
 const ZERO_RENDER_LEVEL = /"renderLevel":0/;
 const NO_SSR_CACHE = /<meta\s+[^>]*name=["']no-ssr-cache["'][^>]*>/i;
 async function processCache({ request, key, requestHandler, requestHandlerOptions, ttl, container, cacheStatus }) {
@@ -33,7 +33,7 @@ async function processCache({ request, key, requestHandler, requestHandlerOption
   const { onError } = requestHandlerOptions;
   const decoder = new TextDecoder();
   if (response.body) {
-    const stream = (0, import_utils2.createTransformStream)();
+    const stream = (0, import_utils.createTransformStream)();
     const reader = response.body.getReader();
     const writer = stream.writable.getWriter();
     let html = "";
@@ -78,9 +78,9 @@ async function processCache({ request, key, requestHandler, requestHandlerOption
 const CACHE_NAMESPACE = "__ssr__cache";
 const storage = (0, import_storer.createMemoryStorage)(CACHE_NAMESPACE);
 function computedKey(req, cacheControl) {
-  const pathname = (0, import_utils2.getPathname)(req);
+  const pathname = (0, import_utils.getPathname)(req);
   const { customKey } = cacheControl;
-  const defaultKey = pathname === "/" ? pathname : (0, import_utils.removeTailSlash)(pathname);
+  const defaultKey = pathname === "/" ? pathname : removeTailSlash(pathname);
   if (customKey) {
     if (typeof customKey === "string") {
       return customKey;

package/dist/esm/plugins/customServer/index.js

@@ -72,6 +72,7 @@ var CustomServer = /* @__PURE__ */ function() {
                 });
                 if (rewriteRoute) {
                   c.set("matchPathname", rewriteRoute.urlPath);
+                  c.set("matchEntryName", current);
                 }
               }
               if (c.finalized) {

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

@@ -133,7 +133,7 @@ function getPageRoutes(routes) {
 function createRenderHandler(render) {
   return function() {
     var _ref = _async_to_generator(function(c, _) {
-      var _c_env_node, logger, reporter, monitors, templates, serverManifest, locals, metrics, matchPathname, loaderContext, request, nodeReq, res, body, status, headers, headersData;
+      var _c_env_node, logger, reporter, monitors, templates, serverManifest, locals, metrics, matchPathname, matchEntryName, loaderContext, request, nodeReq, res, body, status, headers, headersData;
       return _ts_generator(this, function(_state) {
         switch (_state.label) {
           case 0:
@@ -145,6 +145,7 @@ function createRenderHandler(render) {
             locals = c.get("locals");
             metrics = c.get("metrics");
             matchPathname = c.get("matchPathname");
+            matchEntryName = c.get("matchEntryName");
             loaderContext = getLoaderCtx(c);
             request = c.req.raw;
             nodeReq = (_c_env_node = c.env.node) === null || _c_env_node === void 0 ? void 0 : _c_env_node.req;
@@ -160,7 +161,8 @@ function createRenderHandler(render) {
                 serverManifest,
                 loaderContext,
                 locals,
-                matchPathname
+                matchPathname,
+                matchEntryName
               })
             ];
           case 1:

package/dist/esm/plugins/render/render.js

@@ -50,10 +50,19 @@ function getRouter(routes) {
   }
   return router;
 }
-function matchRoute(router, pathname) {
+function matchRoute(router, pathname, entryName) {
   var matched = router.match("*", pathname);
-  var result = matched[0][0];
-  return result || [];
+  if (entryName && matched[0].length > 1) {
+    var matches = matched[0];
+    var result = matches.find(function(param) {
+      var _param = _sliced_to_array(param, 1), route = _param[0];
+      return route.entryName === entryName;
+    });
+    return result || [];
+  } else {
+    var result1 = matched[0][0];
+    return result1 || [];
+  }
 }
 function getHeadersWithoutCookie(headers) {
   var _headers = _object_spread_props(_object_spread({}, headers), {
@@ -75,13 +84,13 @@ function _createRender() {
         2,
         function() {
           var _ref = _async_to_generator(function(req, param2) {
-            var logger, reporter, metrics, monitors, nodeReq, templates, serverManifest, locals, matchPathname, loaderContext, forMatchpathname, _matchRoute, routeInfo, params, framework, fallbackHeader, fallbackReason, onFallback, html, renderMode, headerData, onError, onTiming, onBoundError, renderOptions, response, _tmp;
+            var logger, reporter, metrics, monitors, nodeReq, templates, serverManifest, locals, matchEntryName, matchPathname, loaderContext, forMatchpathname, _matchRoute, routeInfo, params, framework, fallbackHeader, fallbackReason, onFallback, html, renderMode, headerData, onError, onTiming, onBoundError, renderOptions, response, _tmp;
             return _ts_generator(this, function(_state2) {
               switch (_state2.label) {
                 case 0:
-                  logger = param2.logger, reporter = param2.reporter, metrics = param2.metrics, monitors = param2.monitors, nodeReq = param2.nodeReq, templates = param2.templates, serverManifest = param2.serverManifest, locals = param2.locals, matchPathname = param2.matchPathname, loaderContext = param2.loaderContext;
+                  logger = param2.logger, reporter = param2.reporter, metrics = param2.metrics, monitors = param2.monitors, nodeReq = param2.nodeReq, templates = param2.templates, serverManifest = param2.serverManifest, locals = param2.locals, matchEntryName = param2.matchEntryName, matchPathname = param2.matchPathname, loaderContext = param2.loaderContext;
                   forMatchpathname = matchPathname !== null && matchPathname !== void 0 ? matchPathname : getPathname(req);
-                  _matchRoute = _sliced_to_array(matchRoute(router, forMatchpathname), 2), routeInfo = _matchRoute[0], params = _matchRoute[1];
+                  _matchRoute = _sliced_to_array(matchRoute(router, forMatchpathname, matchEntryName), 2), routeInfo = _matchRoute[0], params = _matchRoute[1];
                   framework = metaName || "modern-js";
                   fallbackHeader = "x-".concat(cutNameByHyphen(framework), "-ssr-fallback");
                   fallbackReason = null;

package/dist/esm/plugins/render/ssrCache.js

@@ -4,9 +4,11 @@ import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _type_of } from "@swc/helpers/_/_type_of";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { createMemoryStorage } from "@modern-js/runtime-utils/storer";
-import { removeTailSlash } from "@modern-js/utils";
 import { X_RENDER_CACHE } from "../../constants";
 import { createTransformStream, getPathname } from "../../utils";
+var removeTailSlash = function(s) {
+  return s.replace(/\/+$/, "");
+};
 var ZERO_RENDER_LEVEL = /"renderLevel":0/;
 var NO_SSR_CACHE = /<meta\s+[^>]*name=["']no-ssr-cache["'][^>]*>/i;
 function processCache(_) {

package/dist/esm-node/plugins/customServer/index.js

@@ -32,6 +32,7 @@ class CustomServer {
         const rewriteRoute = routes.find((route) => route.entryName === current);
         if (rewriteRoute) {
           c.set("matchPathname", rewriteRoute.urlPath);
+          c.set("matchEntryName", current);
         }
       }
       if (c.finalized) {

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

@@ -68,6 +68,7 @@ function createRenderHandler(render) {
     const locals = c.get("locals");
     const metrics = c.get("metrics");
     const matchPathname = c.get("matchPathname");
+    const matchEntryName = c.get("matchEntryName");
     const loaderContext = getLoaderCtx(c);
     const request = c.req.raw;
     const nodeReq = (_c_env_node = c.env.node) === null || _c_env_node === void 0 ? void 0 : _c_env_node.req;
@@ -81,7 +82,8 @@ function createRenderHandler(render) {
       serverManifest,
       loaderContext,
       locals,
-      matchPathname
+      matchPathname,
+      matchEntryName
     });
     const { body, status, headers } = res;
     const headersData = {};

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

@@ -28,10 +28,16 @@ function getRouter(routes) {
   }
   return router;
 }
-function matchRoute(router, pathname) {
+function matchRoute(router, pathname, entryName) {
   const matched = router.match("*", pathname);
-  const result = matched[0][0];
-  return result || [];
+  if (entryName && matched[0].length > 1) {
+    const matches = matched[0];
+    const result = matches.find(([route]) => route.entryName === entryName);
+    return result || [];
+  } else {
+    const result = matched[0][0];
+    return result || [];
+  }
 }
 function getHeadersWithoutCookie(headers) {
   const _headers = {
@@ -43,9 +49,9 @@ function getHeadersWithoutCookie(headers) {
 }
 async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig, forceCSR, config, onFallback: onFallbackFn }) {
   const router = getRouter(routes);
-  return async (req, { logger, reporter, metrics, monitors, nodeReq, templates, serverManifest, locals, matchPathname, loaderContext }) => {
+  return async (req, { logger, reporter, metrics, monitors, nodeReq, templates, serverManifest, locals, matchEntryName, matchPathname, loaderContext }) => {
     const forMatchpathname = matchPathname !== null && matchPathname !== void 0 ? matchPathname : getPathname(req);
-    const [routeInfo, params] = matchRoute(router, forMatchpathname);
+    const [routeInfo, params] = matchRoute(router, forMatchpathname, matchEntryName);
     const framework = metaName || "modern-js";
     const fallbackHeader = `x-${cutNameByHyphen(framework)}-ssr-fallback`;
     let fallbackReason = null;

package/dist/esm-node/plugins/render/ssrCache.js

@@ -1,7 +1,7 @@
 import { createMemoryStorage } from "@modern-js/runtime-utils/storer";
-import { removeTailSlash } from "@modern-js/utils";
 import { X_RENDER_CACHE } from "../../constants";
 import { createTransformStream, getPathname } from "../../utils";
+const removeTailSlash = (s) => s.replace(/\/+$/, "");
 const ZERO_RENDER_LEVEL = /"renderLevel":0/;
 const NO_SSR_CACHE = /<meta\s+[^>]*name=["']no-ssr-cache["'][^>]*>/i;
 async function processCache({ request, key, requestHandler, requestHandlerOptions, ttl, container, cacheStatus }) {

package/dist/types/types/config/bff.d.ts

@@ -5,5 +5,6 @@ export interface BffUserConfig {
     proxy?: Record<string, Options>;
     httpMethodDecider?: HttpMethodDecider;
     enableHandleWeb?: boolean;
+    enableCrossProjectInvocation?: boolean;
 }
 export type BffNormalizedConfig = BffUserConfig;

package/dist/types/types/render.d.ts

@@ -16,6 +16,8 @@ export interface RenderOptions {
     reporter?: Reporter;
     /** For compat rewrite MPA, while not modify request  */
     matchPathname?: string;
+    /** For compat rewrite MPA, while not modify request  */
+    matchEntryName?: string;
     monitors?: Monitors;
     serverManifest: ServerManifest;
     nodeReq?: IncomingMessage;

package/dist/types/types/server.d.ts

@@ -36,6 +36,7 @@ type ServerVariables = {
     serverManifest?: ServerManifest;
     templates?: Record<string, string>;
     matchPathname?: string;
+    matchEntryName?: string;
     /**
      * Communicating with custom server hook & modern ssrContext.
      *

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.63.5",
+  "version": "2.63.7",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -53,9 +53,9 @@
     "flatted": "^3.2.9",
     "hono": "^3.12.2",
     "ts-deepmerge": "7.0.2",
-    "@modern-js/plugin": "2.63.5",
-    "@modern-js/runtime-utils": "2.63.5",
-    "@modern-js/utils": "2.63.5"
+    "@modern-js/plugin": "2.63.7",
+    "@modern-js/runtime-utils": "2.63.7",
+    "@modern-js/utils": "2.63.7"
   },
   "devDependencies": {
     "@types/jest": "^29",
@@ -65,9 +65,9 @@
     "jest": "^29",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
-    "@modern-js/types": "2.63.5",
-    "@scripts/build": "2.63.5",
-    "@scripts/jest-config": "2.63.5"
+    "@modern-js/types": "2.63.7",
+    "@scripts/build": "2.63.7",
+    "@scripts/jest-config": "2.63.7"
   },
   "sideEffects": false,
   "publishConfig": {