@modern-js/server-core 2.68.5 → 2.68.7

package/dist/cjs/adapters/node/hono.js

@@ -34,12 +34,18 @@ const httpCallBack2HonoMid = (handler) => {
     req.__honoRequest = context.req;
     req.__templates = context.get("templates") || {};
     req.__serverManifest = context.get("serverManifest") || {};
+    req.__rscServerManifest = context.get("rscServerManifest");
+    req.__rscClientManifest = context.get("rscClientManifest");
+    req.__rscSSRManifest = context.get("rscSSRManifest");
     try {
       await handler(req, res);
     } finally {
       delete req.__honoRequest;
       delete req.__templates;
       delete req.__serverManifest;
+      delete req.__rscServerManifest;
+      delete req.__rscClientManifest;
+      delete req.__rscSSRManifest;
       res.removeListener("pipe", onPipe);
     }
     if ((0, import_helper.isResFinalized)(res)) {

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

@@ -83,19 +83,30 @@ const createWebRequest = (req, res, body) => {
   }
   const originalRequest = new Request(url, init);
   if (needsRequestBody) {
+    const interceptedMethods = [
+      "json",
+      "text",
+      "blob",
+      "arrayBuffer",
+      "formData"
+    ];
     return new Proxy(originalRequest, {
       get(target, prop) {
-        if ([
-          "json",
-          "text",
-          "blob",
-          "arrayBuffer",
-          "formData",
-          "body"
-        ].includes(prop)) {
+        if (interceptedMethods.includes(prop)) {
+          return (...args) => {
+            cloneableReq.resume();
+            return target[prop].call(target, ...args);
+          };
+        }
+        const value = target[prop];
+        if (prop === "body") {
           cloneableReq.resume();
+          return value;
+        }
+        if (typeof value === "function") {
+          return (...args) => value.apply(target, args);
         }
-        return target[prop];
+        return value;
       }
     });
   }

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

@@ -62,9 +62,17 @@ const injectRenderHandlerPlugin = ({ staticGenerate, cacheConfig }) => ({
   }
 });
 async function getRenderHandler({ pwd, routes, config, cacheConfig, metaName, staticGenerate, onFallback }) {
-  var _config_server, _config_security;
+  var _config_server, _config_server1, _config_security;
   const ssrConfig = (_config_server = config.server) === null || _config_server === void 0 ? void 0 : _config_server.ssr;
+  const ssrByEntries = (_config_server1 = config.server) === null || _config_server1 === void 0 ? void 0 : _config_server1.ssrByEntries;
   const forceCSR = typeof ssrConfig === "object" ? ssrConfig.forceCSR : false;
+  const forceCSRMap = /* @__PURE__ */ new Map();
+  if (ssrByEntries) {
+    Object.entries(ssrByEntries).forEach(([entryName, ssrConfig2]) => {
+      var _ssrConfig_forceCSR;
+      forceCSRMap.set(entryName, typeof ssrConfig2 === "object" ? (_ssrConfig_forceCSR = ssrConfig2.forceCSR) !== null && _ssrConfig_forceCSR !== void 0 ? _ssrConfig_forceCSR : false : false);
+    });
+  }
   const render = (0, import_render.createRender)({
     routes,
     pwd,
@@ -72,6 +80,7 @@ async function getRenderHandler({ pwd, routes, config, cacheConfig, metaName, st
     staticGenerate,
     cacheConfig,
     forceCSR,
+    forceCSRMap,
     nonce: (_config_security = config.security) === null || _config_security === void 0 ? void 0 : _config_security.nonce,
     metaName: metaName || "modern-js",
     onFallback

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

@@ -83,7 +83,7 @@ function getHeadersWithoutCookie(headers) {
   delete _headers.cookie;
   return _headers;
 }
-async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig, forceCSR, config, onFallback }) {
+async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig, forceCSR, forceCSRMap, config, onFallback }) {
   const router = getRouter(routes);
   return async (req, { logger, reporter, metrics, monitors, nodeReq, templates, serverManifest, rscClientManifest, rscSSRManifest, rscServerManifest, locals, matchEntryName, matchPathname, loaderContext }) => {
     const forMatchpathname = matchPathname !== null && matchPathname !== void 0 ? matchPathname : (0, import_utils2.getPathname)(req);
@@ -116,7 +116,9 @@ async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig
         }
       });
     }
-    const renderMode = await getRenderMode(req, fallbackHeader, routeInfo.isSSR, forceCSR, nodeReq, fallbackWrapper);
+    var _forceCSRMap_get;
+    const finalForceCSR = routeInfo.entryName ? (_forceCSRMap_get = forceCSRMap === null || forceCSRMap === void 0 ? void 0 : forceCSRMap.get(routeInfo.entryName)) !== null && _forceCSRMap_get !== void 0 ? _forceCSRMap_get : forceCSR : forceCSR;
+    const renderMode = await getRenderMode(req, fallbackHeader, routeInfo.isSSR, finalForceCSR, nodeReq, fallbackWrapper);
     const headerData = (0, import_utils2.parseHeaders)(req);
     const onError = (e, key) => {
       monitors === null || monitors === void 0 ? void 0 : monitors.error(`SSR Error - ${key || (e instanceof Error ? e.name : e)}, error = %s, req.url = %s, req.headers = %o`, e instanceof Error ? e.stack || e.message : e, forMatchpathname, getHeadersWithoutCookie(headerData));

package/dist/esm/adapters/node/hono.js

@@ -16,6 +16,9 @@ var httpCallBack2HonoMid = function(handler) {
             req.__honoRequest = context.req;
             req.__templates = context.get("templates") || {};
             req.__serverManifest = context.get("serverManifest") || {};
+            req.__rscServerManifest = context.get("rscServerManifest");
+            req.__rscClientManifest = context.get("rscClientManifest");
+            req.__rscSSRManifest = context.get("rscSSRManifest");
             _state.label = 1;
           case 1:
             _state.trys.push([
@@ -38,6 +41,9 @@ var httpCallBack2HonoMid = function(handler) {
             delete req.__honoRequest;
             delete req.__templates;
             delete req.__serverManifest;
+            delete req.__rscServerManifest;
+            delete req.__rscClientManifest;
+            delete req.__rscSSRManifest;
             res.removeListener("pipe", onPipe);
             return [
               7

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

@@ -2,6 +2,7 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
+import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { ServerResponse } from "node:http";
 import { Readable, Writable } from "node:stream";
@@ -89,19 +90,41 @@ var createWebRequest = function(req, res, body) {
   }
   var originalRequest = new Request(url, init);
   if (needsRequestBody) {
+    var interceptedMethods = [
+      "json",
+      "text",
+      "blob",
+      "arrayBuffer",
+      "formData"
+    ];
     return new Proxy(originalRequest, {
       get: function get(target, prop) {
-        if ([
-          "json",
-          "text",
-          "blob",
-          "arrayBuffer",
-          "formData",
-          "body"
-        ].includes(prop)) {
+        if (interceptedMethods.includes(prop)) {
+          return function() {
+            for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+              args[_key] = arguments[_key];
+            }
+            var _target_prop;
+            cloneableReq.resume();
+            return (_target_prop = target[prop]).call.apply(_target_prop, [
+              target
+            ].concat(_to_consumable_array(args)));
+          };
+        }
+        var value2 = target[prop];
+        if (prop === "body") {
           cloneableReq.resume();
+          return value2;
+        }
+        if (typeof value2 === "function") {
+          return function() {
+            for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+              args[_key] = arguments[_key];
+            }
+            return value2.apply(target, args);
+          };
         }
-        return target[prop];
+        return value2;
       }
     });
   }

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

@@ -1,6 +1,7 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
+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 { createRender } from "./render";
@@ -85,11 +86,20 @@ function getRenderHandler(_) {
 }
 function _getRenderHandler() {
   _getRenderHandler = _async_to_generator(function(param) {
-    var pwd, routes, config, cacheConfig, metaName, staticGenerate, onFallback, _config_server, _config_security, ssrConfig, forceCSR, render;
+    var pwd, routes, config, cacheConfig, metaName, staticGenerate, onFallback, _config_server, _config_server1, _config_security, ssrConfig, ssrByEntries, forceCSR, forceCSRMap, render;
     return _ts_generator(this, function(_state) {
       pwd = param.pwd, routes = param.routes, config = param.config, cacheConfig = param.cacheConfig, metaName = param.metaName, staticGenerate = param.staticGenerate, onFallback = param.onFallback;
       ssrConfig = (_config_server = config.server) === null || _config_server === void 0 ? void 0 : _config_server.ssr;
+      ssrByEntries = (_config_server1 = config.server) === null || _config_server1 === void 0 ? void 0 : _config_server1.ssrByEntries;
       forceCSR = (typeof ssrConfig === "undefined" ? "undefined" : _type_of(ssrConfig)) === "object" ? ssrConfig.forceCSR : false;
+      forceCSRMap = /* @__PURE__ */ new Map();
+      if (ssrByEntries) {
+        Object.entries(ssrByEntries).forEach(function(param2) {
+          var _param = _sliced_to_array(param2, 2), entryName = _param[0], ssrConfig2 = _param[1];
+          var _ssrConfig_forceCSR;
+          forceCSRMap.set(entryName, (typeof ssrConfig2 === "undefined" ? "undefined" : _type_of(ssrConfig2)) === "object" ? (_ssrConfig_forceCSR = ssrConfig2.forceCSR) !== null && _ssrConfig_forceCSR !== void 0 ? _ssrConfig_forceCSR : false : false);
+        });
+      }
       render = createRender({
         routes,
         pwd,
@@ -97,6 +107,7 @@ function _getRenderHandler() {
         staticGenerate,
         cacheConfig,
         forceCSR,
+        forceCSRMap,
         nonce: (_config_security = config.security) === null || _config_security === void 0 ? void 0 : _config_security.nonce,
         metaName: metaName || "modern-js",
         onFallback

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

@@ -79,15 +79,15 @@ function createRender(_) {
 }
 function _createRender() {
   _createRender = _async_to_generator(function(param) {
-    var routes, pwd, metaName, staticGenerate, cacheConfig, forceCSR, config, onFallback, router;
+    var routes, pwd, metaName, staticGenerate, cacheConfig, forceCSR, forceCSRMap, config, onFallback, router;
     return _ts_generator(this, function(_state) {
-      routes = param.routes, pwd = param.pwd, metaName = param.metaName, staticGenerate = param.staticGenerate, cacheConfig = param.cacheConfig, forceCSR = param.forceCSR, config = param.config, onFallback = param.onFallback;
+      routes = param.routes, pwd = param.pwd, metaName = param.metaName, staticGenerate = param.staticGenerate, cacheConfig = param.cacheConfig, forceCSR = param.forceCSR, forceCSRMap = param.forceCSRMap, config = param.config, onFallback = param.onFallback;
       router = getRouter(routes);
       return [
         2,
         function() {
           var _ref = _async_to_generator(function(req, param2) {
-            var logger, reporter, metrics, monitors, nodeReq, templates, serverManifest, rscClientManifest, rscSSRManifest, rscServerManifest, locals, matchEntryName, matchPathname, loaderContext, forMatchpathname, _matchRoute, routeInfo, params, framework, fallbackHeader, fallbackReason, fallbackWrapper, html, renderMode, headerData, onError, onTiming, renderOptions, response, _tmp;
+            var logger, reporter, metrics, monitors, nodeReq, templates, serverManifest, rscClientManifest, rscSSRManifest, rscServerManifest, locals, matchEntryName, matchPathname, loaderContext, forMatchpathname, _matchRoute, routeInfo, params, framework, fallbackHeader, fallbackReason, fallbackWrapper, html, _forceCSRMap_get, finalForceCSR, renderMode, headerData, onError, onTiming, renderOptions, response, _tmp;
             return _ts_generator(this, function(_state2) {
               switch (_state2.label) {
                 case 0:
@@ -138,9 +138,10 @@ function _createRender() {
                       })
                     ];
                   }
+                  finalForceCSR = routeInfo.entryName ? (_forceCSRMap_get = forceCSRMap === null || forceCSRMap === void 0 ? void 0 : forceCSRMap.get(routeInfo.entryName)) !== null && _forceCSRMap_get !== void 0 ? _forceCSRMap_get : forceCSR : forceCSR;
                   return [
                     4,
-                    getRenderMode(req, fallbackHeader, routeInfo.isSSR, forceCSR, nodeReq, fallbackWrapper)
+                    getRenderMode(req, fallbackHeader, routeInfo.isSSR, finalForceCSR, nodeReq, fallbackWrapper)
                   ];
                 case 1:
                   renderMode = _state2.sent();

package/dist/esm-node/adapters/node/hono.js

@@ -9,12 +9,18 @@ const httpCallBack2HonoMid = (handler) => {
     req.__honoRequest = context.req;
     req.__templates = context.get("templates") || {};
     req.__serverManifest = context.get("serverManifest") || {};
+    req.__rscServerManifest = context.get("rscServerManifest");
+    req.__rscClientManifest = context.get("rscClientManifest");
+    req.__rscSSRManifest = context.get("rscSSRManifest");
     try {
       await handler(req, res);
     } finally {
       delete req.__honoRequest;
       delete req.__templates;
       delete req.__serverManifest;
+      delete req.__rscServerManifest;
+      delete req.__rscClientManifest;
+      delete req.__rscSSRManifest;
       res.removeListener("pipe", onPipe);
     }
     if (isResFinalized(res)) {

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

@@ -48,19 +48,30 @@ const createWebRequest = (req, res, body) => {
   }
   const originalRequest = new Request(url, init);
   if (needsRequestBody) {
+    const interceptedMethods = [
+      "json",
+      "text",
+      "blob",
+      "arrayBuffer",
+      "formData"
+    ];
     return new Proxy(originalRequest, {
       get(target, prop) {
-        if ([
-          "json",
-          "text",
-          "blob",
-          "arrayBuffer",
-          "formData",
-          "body"
-        ].includes(prop)) {
+        if (interceptedMethods.includes(prop)) {
+          return (...args) => {
+            cloneableReq.resume();
+            return target[prop].call(target, ...args);
+          };
+        }
+        const value = target[prop];
+        if (prop === "body") {
           cloneableReq.resume();
+          return value;
+        }
+        if (typeof value === "function") {
+          return (...args) => value.apply(target, args);
         }
-        return target[prop];
+        return value;
       }
     });
   }

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

@@ -38,9 +38,17 @@ const injectRenderHandlerPlugin = ({ staticGenerate, cacheConfig }) => ({
   }
 });
 async function getRenderHandler({ pwd, routes, config, cacheConfig, metaName, staticGenerate, onFallback }) {
-  var _config_server, _config_security;
+  var _config_server, _config_server1, _config_security;
   const ssrConfig = (_config_server = config.server) === null || _config_server === void 0 ? void 0 : _config_server.ssr;
+  const ssrByEntries = (_config_server1 = config.server) === null || _config_server1 === void 0 ? void 0 : _config_server1.ssrByEntries;
   const forceCSR = typeof ssrConfig === "object" ? ssrConfig.forceCSR : false;
+  const forceCSRMap = /* @__PURE__ */ new Map();
+  if (ssrByEntries) {
+    Object.entries(ssrByEntries).forEach(([entryName, ssrConfig2]) => {
+      var _ssrConfig_forceCSR;
+      forceCSRMap.set(entryName, typeof ssrConfig2 === "object" ? (_ssrConfig_forceCSR = ssrConfig2.forceCSR) !== null && _ssrConfig_forceCSR !== void 0 ? _ssrConfig_forceCSR : false : false);
+    });
+  }
   const render = createRender({
     routes,
     pwd,
@@ -48,6 +56,7 @@ async function getRenderHandler({ pwd, routes, config, cacheConfig, metaName, st
     staticGenerate,
     cacheConfig,
     forceCSR,
+    forceCSRMap,
     nonce: (_config_security = config.security) === null || _config_security === void 0 ? void 0 : _config_security.nonce,
     metaName: metaName || "modern-js",
     onFallback

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

@@ -50,7 +50,7 @@ function getHeadersWithoutCookie(headers) {
   delete _headers.cookie;
   return _headers;
 }
-async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig, forceCSR, config, onFallback }) {
+async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig, forceCSR, forceCSRMap, config, onFallback }) {
   const router = getRouter(routes);
   return async (req, { logger, reporter, metrics, monitors, nodeReq, templates, serverManifest, rscClientManifest, rscSSRManifest, rscServerManifest, locals, matchEntryName, matchPathname, loaderContext }) => {
     const forMatchpathname = matchPathname !== null && matchPathname !== void 0 ? matchPathname : getPathname(req);
@@ -83,7 +83,9 @@ async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig
         }
       });
     }
-    const renderMode = await getRenderMode(req, fallbackHeader, routeInfo.isSSR, forceCSR, nodeReq, fallbackWrapper);
+    var _forceCSRMap_get;
+    const finalForceCSR = routeInfo.entryName ? (_forceCSRMap_get = forceCSRMap === null || forceCSRMap === void 0 ? void 0 : forceCSRMap.get(routeInfo.entryName)) !== null && _forceCSRMap_get !== void 0 ? _forceCSRMap_get : forceCSR : forceCSR;
+    const renderMode = await getRenderMode(req, fallbackHeader, routeInfo.isSSR, finalForceCSR, nodeReq, fallbackWrapper);
     const headerData = parseHeaders(req);
     const onError = (e, key) => {
       monitors === null || monitors === void 0 ? void 0 : monitors.error(`SSR Error - ${key || (e instanceof Error ? e.name : e)}, error = %s, req.url = %s, req.headers = %o`, e instanceof Error ? e.stack || e.message : e, forMatchpathname, getHeadersWithoutCookie(headerData));

package/dist/types/adapters/node/helper/utils.d.ts

@@ -1,9 +1,12 @@
-import type { NodeRequest, NodeResponse } from '@modern-js/types/server';
+import type { ClientManifest, NodeRequest, NodeResponse, SSRManifest } from '@modern-js/types/server';
 import type { HonoRequest, ServerManifest } from '../../../types';
 type ExtendedNodeRequest = NodeRequest & {
     __honoRequest?: HonoRequest;
     __templates?: Record<string, string>;
     __serverManifest?: ServerManifest;
+    __rscServerManifest?: ServerManifest;
+    __rscClientManifest?: ClientManifest;
+    __rscSSRManifest?: SSRManifest;
 };
 type ExtendedNodeResponse = NodeResponse & {
     _modernBodyPiped?: boolean;

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

@@ -10,7 +10,8 @@ interface CreateRenderOptions {
     onFallback?: OnFallback;
     metaName?: string;
     forceCSR?: boolean;
+    forceCSRMap?: Map<string, boolean>;
     nonce?: string;
 }
-export declare function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig, forceCSR, config, onFallback, }: CreateRenderOptions): Promise<Render>;
+export declare function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig, forceCSR, forceCSRMap, config, onFallback, }: CreateRenderOptions): Promise<Render>;
 export {};

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

@@ -12,7 +12,6 @@ export type SSR = boolean | {
     inlineScript?: boolean;
     disablePrerender?: boolean;
     unsafeHeaders?: string[];
-    scriptLoading?: 'defer' | 'blocking' | 'module' | 'async';
     loaderFailureMode?: 'clientRender' | 'errorBoundary';
 };
 export type SSRByEntries = Record<string, SSR>;

package/package.json

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