@modern-js/server-core 2.69.5 → 2.69.7

package/dist/cjs/adapters/node/plugins/resource.js

@@ -130,15 +130,13 @@ async function getRscSSRManifest(pwd) {
   const rscSSRManifest = await (0, import_utils.compatibleRequire)(import_path.default.join(pwd, "react-ssr-manifest.json")).catch((_) => void 0);
   return rscSSRManifest;
 }
-const injectRscManifestPlugin = () => ({
+const injectRscManifestPlugin = (enableRsc) => ({
   name: "@modern-js/plugin-inject-rsc-manifest",
   setup(api) {
     return {
       async prepare() {
-        var _config_server;
         const { middlewares, distDirectory: pwd } = api.useAppContext();
-        const config = api.useConfigContext();
-        if (!((_config_server = config.server) === null || _config_server === void 0 ? void 0 : _config_server.rsc)) {
+        if (!enableRsc) {
           return;
         }
         middlewares.push({

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

@@ -28,6 +28,10 @@ var import_utils = require("../../utils");
 var import_customServer = require("../customServer");
 var import_monitors = require("../monitors");
 __reExport(render_exports, require("./inject"), module.exports);
+const DYNAMIC_ROUTE_REG = /\/:./;
+function escapeRegexSpecialChars(path) {
+  return path.replace(/[()[\]{}*+?.^$|\\]/g, "\\$&");
+}
 const renderPlugin = () => ({
   name: "@modern-js/plugin-render",
   setup(api) {
@@ -48,7 +52,9 @@ const renderPlugin = () => ({
         for (const route of pageRoutes) {
           var _config_server;
           const { urlPath: originUrlPath, entryName = import_constants.MAIN_ENTRY_NAME } = route;
-          const urlPath = originUrlPath.endsWith("/") ? `${originUrlPath}*` : `${originUrlPath}/*`;
+          const isDynamic = DYNAMIC_ROUTE_REG.test(originUrlPath);
+          const escapedPath = isDynamic ? originUrlPath : escapeRegexSpecialChars(originUrlPath);
+          const urlPath = escapedPath.endsWith("/") ? `${escapedPath}*` : `${escapedPath}/*`;
           if (((_config_server = config.server) === null || _config_server === void 0 ? void 0 : _config_server.disableHook) !== true) {
             const customServerHookMiddleware = customServer.getHookMiddleware(entryName, routes);
             middlewares.push({

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

@@ -269,7 +269,7 @@ function injectFallbackReasonToHtml({ html, reason, framework }) {
 }
 async function csrRender(request, options) {
   const { html, rscClientManifest } = options;
-  if (!rscClientManifest || process.env.MODERN_DISABLE_INJECT_RSC_DATA) {
+  if (!rscClientManifest || process.env.MODERN_DISABLE_INJECT_RSC_DATA || !options.routeInfo.isRSC) {
     return new Response(html, {
       status: 200,
       headers: new Headers({

package/dist/cjs/plugins/route.js

@@ -51,7 +51,8 @@ const injectRoutePlugin = () => ({
             name: "inject-route-info",
             path: urlPath,
             handler: injectRoute({
-              entryName
+              entryName,
+              urlPath: originUrlPath
             })
           });
         }

package/dist/esm/adapters/node/plugins/resource.js

@@ -405,18 +405,17 @@ function _getRscSSRManifest() {
   });
   return _getRscSSRManifest.apply(this, arguments);
 }
-var injectRscManifestPlugin = function() {
+var injectRscManifestPlugin = function(enableRsc) {
   return {
     name: "@modern-js/plugin-inject-rsc-manifest",
     setup: function setup(api) {
       return {
         prepare: function prepare() {
           return _async_to_generator(function() {
-            var _config_server, _api_useAppContext, middlewares, pwd, config;
+            var _api_useAppContext, middlewares, pwd;
             return _ts_generator(this, function(_state) {
               _api_useAppContext = api.useAppContext(), middlewares = _api_useAppContext.middlewares, pwd = _api_useAppContext.distDirectory;
-              config = api.useConfigContext();
-              if (!((_config_server = config.server) === null || _config_server === void 0 ? void 0 : _config_server.rsc)) {
+              if (!enableRsc) {
                 return [
                   2
                 ];

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

@@ -7,6 +7,10 @@ import { sortRoutes } from "../../utils";
 import { CustomServer } from "../customServer";
 import { requestLatencyMiddleware } from "../monitors";
 export * from "./inject";
+var DYNAMIC_ROUTE_REG = /\/:./;
+function escapeRegexSpecialChars(path) {
+  return path.replace(/[()[\]{}*+?.^$|\\]/g, "\\$&");
+}
 var renderPlugin = function() {
   return {
     name: "@modern-js/plugin-render",
@@ -42,13 +46,15 @@ var renderPlugin = function() {
                     8
                   ]);
                   _loop = function() {
-                    var route, _config_server, originUrlPath, _route_entryName, entryName, urlPath, customServerHookMiddleware, customServerMiddleware;
+                    var route, _config_server, originUrlPath, _route_entryName, entryName, isDynamic, escapedPath, urlPath, customServerHookMiddleware, customServerMiddleware;
                     return _ts_generator(this, function(_state2) {
                       switch (_state2.label) {
                         case 0:
                           route = _step.value;
                           originUrlPath = route.urlPath, _route_entryName = route.entryName, entryName = _route_entryName === void 0 ? MAIN_ENTRY_NAME : _route_entryName;
-                          urlPath = originUrlPath.endsWith("/") ? "".concat(originUrlPath, "*") : "".concat(originUrlPath, "/*");
+                          isDynamic = DYNAMIC_ROUTE_REG.test(originUrlPath);
+                          escapedPath = isDynamic ? originUrlPath : escapeRegexSpecialChars(originUrlPath);
+                          urlPath = escapedPath.endsWith("/") ? "".concat(escapedPath, "*") : "".concat(escapedPath, "/*");
                           if (((_config_server = config.server) === null || _config_server === void 0 ? void 0 : _config_server.disableHook) !== true) {
                             customServerHookMiddleware = customServer.getHookMiddleware(entryName, routes);
                             middlewares.push({

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

@@ -544,7 +544,7 @@ function _csrRender() {
     var html, rscClientManifest;
     return _ts_generator(this, function(_state) {
       html = options.html, rscClientManifest = options.rscClientManifest;
-      if (!rscClientManifest || process.env.MODERN_DISABLE_INJECT_RSC_DATA) {
+      if (!rscClientManifest || process.env.MODERN_DISABLE_INJECT_RSC_DATA || !options.routeInfo.isRSC) {
         return [
           2,
           new Response(html, {

package/dist/esm/plugins/route.js

@@ -59,7 +59,8 @@ var injectRoutePlugin = function() {
                     name: "inject-route-info",
                     path: urlPath,
                     handler: injectRoute({
-                      entryName
+                      entryName,
+                      urlPath: originUrlPath
                     })
                   });
                 }

package/dist/esm-node/adapters/node/plugins/resource.js

@@ -89,15 +89,13 @@ async function getRscSSRManifest(pwd) {
   const rscSSRManifest = await compatibleRequire(path.join(pwd, "react-ssr-manifest.json")).catch((_) => void 0);
   return rscSSRManifest;
 }
-const injectRscManifestPlugin = () => ({
+const injectRscManifestPlugin = (enableRsc) => ({
   name: "@modern-js/plugin-inject-rsc-manifest",
   setup(api) {
     return {
       async prepare() {
-        var _config_server;
         const { middlewares, distDirectory: pwd } = api.useAppContext();
-        const config = api.useConfigContext();
-        if (!((_config_server = config.server) === null || _config_server === void 0 ? void 0 : _config_server.rsc)) {
+        if (!enableRsc) {
           return;
         }
         middlewares.push({

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

@@ -4,6 +4,10 @@ import { sortRoutes } from "../../utils";
 import { CustomServer } from "../customServer";
 import { requestLatencyMiddleware } from "../monitors";
 export * from "./inject";
+const DYNAMIC_ROUTE_REG = /\/:./;
+function escapeRegexSpecialChars(path) {
+  return path.replace(/[()[\]{}*+?.^$|\\]/g, "\\$&");
+}
 const renderPlugin = () => ({
   name: "@modern-js/plugin-render",
   setup(api) {
@@ -24,7 +28,9 @@ const renderPlugin = () => ({
         for (const route of pageRoutes) {
           var _config_server;
           const { urlPath: originUrlPath, entryName = MAIN_ENTRY_NAME } = route;
-          const urlPath = originUrlPath.endsWith("/") ? `${originUrlPath}*` : `${originUrlPath}/*`;
+          const isDynamic = DYNAMIC_ROUTE_REG.test(originUrlPath);
+          const escapedPath = isDynamic ? originUrlPath : escapeRegexSpecialChars(originUrlPath);
+          const urlPath = escapedPath.endsWith("/") ? `${escapedPath}*` : `${escapedPath}/*`;
           if (((_config_server = config.server) === null || _config_server === void 0 ? void 0 : _config_server.disableHook) !== true) {
             const customServerHookMiddleware = customServer.getHookMiddleware(entryName, routes);
             middlewares.push({

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

@@ -236,7 +236,7 @@ function injectFallbackReasonToHtml({ html, reason, framework }) {
 }
 async function csrRender(request, options) {
   const { html, rscClientManifest } = options;
-  if (!rscClientManifest || process.env.MODERN_DISABLE_INJECT_RSC_DATA) {
+  if (!rscClientManifest || process.env.MODERN_DISABLE_INJECT_RSC_DATA || !options.routeInfo.isRSC) {
     return new Response(html, {
       status: 200,
       headers: new Headers({

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

@@ -28,7 +28,8 @@ const injectRoutePlugin = () => ({
             name: "inject-route-info",
             path: urlPath,
             handler: injectRoute({
-              entryName
+              entryName,
+              urlPath: originUrlPath
             })
           });
         }

package/dist/types/adapters/node/plugins/resource.d.ts

@@ -7,5 +7,5 @@ export declare function injectServerManifest(pwd: string, routes?: ServerRoute[]
 export declare function getRscServerManifest(pwd: string): Promise<any>;
 export declare function getClientManifest(pwd: string): Promise<any>;
 export declare function getRscSSRManifest(pwd: string): Promise<any>;
-export declare const injectRscManifestPlugin: () => ServerPluginLegacy;
+export declare const injectRscManifestPlugin: (enableRsc: boolean) => ServerPluginLegacy;
 export declare const injectResourcePlugin: () => ServerPluginLegacy;

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

@@ -58,9 +58,9 @@ type ServerVariables = {
      */
     locals?: Record<string, any>;
     /**
-     * The current matched route, now only expose entryName field.
+     * The current matched route, now only expose entryName and urlPath.
      */
-    route: Required<Pick<ServerRoute, 'entryName'>>;
+    route: Required<Pick<ServerRoute, 'entryName' | 'urlPath'>>;
 };
 export type ServerEnv = {
     Variables: ServerVariables;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.69.5",
+  "version": "2.69.7",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -62,10 +62,10 @@
     "flatted": "^3.3.3",
     "hono": "^3.12.2",
     "ts-deepmerge": "7.0.2",
-    "@modern-js/plugin": "2.69.5",
-    "@modern-js/plugin-v2": "2.69.5",
-    "@modern-js/runtime-utils": "2.69.5",
-    "@modern-js/utils": "2.69.5"
+    "@modern-js/plugin": "2.69.7",
+    "@modern-js/plugin-v2": "2.69.7",
+    "@modern-js/runtime-utils": "2.69.7",
+    "@modern-js/utils": "2.69.7"
   },
   "devDependencies": {
     "@types/cloneable-readable": "^2.0.3",
@@ -76,8 +76,8 @@
     "jest": "^29",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
+    "@modern-js/types": "2.69.7",
     "@scripts/build": "2.66.0",
-    "@modern-js/types": "2.69.5",
     "@scripts/jest-config": "2.66.0"
   },
   "sideEffects": false,