@modern-js/server-core 2.59.0 → 2.60.1

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

@@ -56,7 +56,7 @@ const createWebRequest = (req, res, body) => {
     headers: headerRecord,
     signal: controller.signal
   };
-  res.on("close", () => controller.abort());
+  res.on("close", () => controller.abort("res closed"));
   if (body || !(method === "GET" || method === "HEAD") && ((_req_url = req.url) === null || _req_url === void 0 ? void 0 : _req_url.includes("__loader"))) {
     init.body = body !== null && body !== void 0 ? body : (0, import_stream.createReadableStreamFromReadable)(req);
     init.duplex = "half";

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

@@ -25,6 +25,7 @@ module.exports = __toCommonJS(ssrCache_exports);
 var import_storer = require("@modern-js/runtime-utils/storer");
 var import_constants = require("../../constants");
 var import_utils = require("../../utils");
+const ZERO_RENDER_LEVEL = /"renderLevel":0/;
 async function processCache({ request, key, requestHandler, requestHandlerOptions, ttl, container, cacheStatus }) {
   const response = await requestHandler(request, requestHandlerOptions);
   const decoder = new TextDecoder();
@@ -35,6 +36,11 @@ async function processCache({ request, key, requestHandler, requestHandlerOption
     let html = "";
     const push = () => reader.read().then(({ done, value }) => {
       if (done) {
+        const match = ZERO_RENDER_LEVEL.test(html);
+        if (match) {
+          writer.close();
+          return;
+        }
         const current = Date.now();
         const cache = {
           val: html,

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

@@ -25,7 +25,7 @@ var createWebRequest = function(req, res, body) {
     signal: controller.signal
   };
   res.on("close", function() {
-    return controller.abort();
+    return controller.abort("res closed");
   });
   if (body || !(method === "GET" || method === "HEAD") && ((_req_url = req.url) === null || _req_url === void 0 ? void 0 : _req_url.includes("__loader"))) {
     init.body = body !== null && body !== void 0 ? body : createReadableStreamFromReadable(req);

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 _type_of } from "@swc/helpers/_/_type_of";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { createRender } from "./render";
 var injectRenderHandlerPlugin = function(param) {
@@ -87,7 +88,7 @@ function _getRenderHandler() {
     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;
-      forceCSR = typeof ssrConfig === "object" ? ssrConfig.forceCSR : false;
+      forceCSR = (typeof ssrConfig === "undefined" ? "undefined" : _type_of(ssrConfig)) === "object" ? ssrConfig.forceCSR : false;
       render = createRender({
         routes,
         pwd,

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

@@ -1,10 +1,12 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _define_property } from "@swc/helpers/_/_define_property";
 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 { X_RENDER_CACHE } from "../../constants";
 import { createTransformStream, getPathname } from "../../utils";
+var ZERO_RENDER_LEVEL = /"renderLevel":0/;
 function processCache(_) {
   return _processCache.apply(this, arguments);
 }
@@ -31,6 +33,11 @@ function _processCache() {
               return reader.read().then(function(param2) {
                 var done = param2.done, value = param2.value;
                 if (done) {
+                  var match = ZERO_RENDER_LEVEL.test(html);
+                  if (match) {
+                    writer.close();
+                    return;
+                  }
                   var current = Date.now();
                   var cache = {
                     val: html,
@@ -125,7 +132,7 @@ function matchCacheControl(cacheOption, req) {
     return typeof option2 === "function";
   }
   function isCacheControl(option2) {
-    return typeof option2 === "object" && option2 !== null && "maxAge" in option2;
+    return (typeof option2 === "undefined" ? "undefined" : _type_of(option2)) === "object" && option2 !== null && "maxAge" in option2;
   }
 }
 function getCacheResult(request, options) {

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

@@ -20,7 +20,7 @@ const createWebRequest = (req, res, body) => {
     headers: headerRecord,
     signal: controller.signal
   };
-  res.on("close", () => controller.abort());
+  res.on("close", () => controller.abort("res closed"));
   if (body || !(method === "GET" || method === "HEAD") && ((_req_url = req.url) === null || _req_url === void 0 ? void 0 : _req_url.includes("__loader"))) {
     init.body = body !== null && body !== void 0 ? body : createReadableStreamFromReadable(req);
     init.duplex = "half";

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

@@ -1,6 +1,7 @@
 import { createMemoryStorage } from "@modern-js/runtime-utils/storer";
 import { X_RENDER_CACHE } from "../../constants";
 import { createTransformStream, getPathname } from "../../utils";
+const ZERO_RENDER_LEVEL = /"renderLevel":0/;
 async function processCache({ request, key, requestHandler, requestHandlerOptions, ttl, container, cacheStatus }) {
   const response = await requestHandler(request, requestHandlerOptions);
   const decoder = new TextDecoder();
@@ -11,6 +12,11 @@ async function processCache({ request, key, requestHandler, requestHandlerOption
     let html = "";
     const push = () => reader.read().then(({ done, value }) => {
       if (done) {
+        const match = ZERO_RENDER_LEVEL.test(html);
+        if (match) {
+          writer.close();
+          return;
+        }
         const current = Date.now();
         const cache = {
           val: html,

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.59.0",
+  "version": "2.60.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -46,16 +46,16 @@
     "node": ">=16.2.0"
   },
   "dependencies": {
-    "@swc/helpers": "0.5.3",
+    "@swc/helpers": "0.5.13",
     "@web-std/fetch": "^4.2.1",
     "@web-std/file": "^3.0.3",
     "@web-std/stream": "^1.0.3",
     "flatted": "^3.2.9",
     "hono": "^3.12.2",
     "ts-deepmerge": "7.0.0",
-    "@modern-js/plugin": "2.59.0",
-    "@modern-js/utils": "2.59.0",
-    "@modern-js/runtime-utils": "2.59.0"
+    "@modern-js/plugin": "2.60.1",
+    "@modern-js/utils": "2.60.1",
+    "@modern-js/runtime-utils": "2.60.1"
   },
   "devDependencies": {
     "@types/jest": "^29",
@@ -65,9 +65,9 @@
     "jest": "^29",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
-    "@modern-js/types": "2.59.0",
-    "@scripts/build": "2.59.0",
-    "@scripts/jest-config": "2.59.0"
+    "@modern-js/types": "2.60.1",
+    "@scripts/build": "2.60.1",
+    "@scripts/jest-config": "2.60.1"
   },
   "sideEffects": false,
   "publishConfig": {