@modern-js/server-core 2.57.0 → 2.57.1

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

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -15,6 +17,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var render_exports = {};
 __export(render_exports, {
@@ -23,7 +33,6 @@ __export(render_exports, {
 module.exports = __toCommonJS(render_exports);
 var import_universal = require("@modern-js/utils/universal");
 var import_trie_router = require("hono/router/trie-router");
-var import_router = require("@modern-js/runtime-utils/router");
 var import_utils = require("../../utils");
 var import_constants = require("../../constants");
 var import_dataHandler = require("./dataHandler");
@@ -155,8 +164,9 @@ async function renderHandler(request, options, mode, onError) {
     const { nestedRoutesJson } = serverManifest;
     const routes = nestedRoutesJson === null || nestedRoutesJson === void 0 ? void 0 : nestedRoutesJson[options.routeInfo.entryName];
     if (routes) {
+      const { matchRoutes } = await Promise.resolve().then(() => __toESM(require("@modern-js/runtime-utils/remix-router")));
       const url = new URL(request.url);
-      const matchedRoutes = (0, import_router.matchRoutes)(routes, url.pathname, options.routeInfo.urlPath);
+      const matchedRoutes = matchRoutes(routes, url.pathname, options.routeInfo.urlPath);
       if (!matchedRoutes) {
         response = csrRender(options.html);
       } else {

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

@@ -8,7 +8,6 @@ import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { cutNameByHyphen } from "@modern-js/utils/universal";
 import { TrieRouter } from "hono/router/trie-router";
-import { matchRoutes } from "@modern-js/runtime-utils/router";
 import { parseQuery, getPathname, createErrorHtml, sortRoutes, transformResponse, onError as onErrorFn, ErrorDigest, parseHeaders } from "../../utils";
 import { REPLACE_REG, X_MODERNJS_RENDER } from "../../constants";
 import { dataHandler } from "./dataHandler";
@@ -258,7 +257,7 @@ function renderHandler(request, options, mode, onError) {
 }
 function _renderHandler() {
   _renderHandler = _async_to_generator(function(request, options, mode, onError) {
-    var _options_config_server, serverData, response, serverManifest, ssrByRouteIds, nestedRoutesJson, routes, url, matchedRoutes, _lastMatch_route, lastMatch, e, newRes, routeInfo;
+    var _options_config_server, serverData, response, serverManifest, ssrByRouteIds, nestedRoutesJson, routes, matchRoutes, url, matchedRoutes, _lastMatch_route, lastMatch, e, newRes, routeInfo;
     function applyExtendHeaders(r, route) {
       Object.entries(route.responseHeaders || {}).forEach(function(param) {
         var _param = _sliced_to_array(param, 2), k = _param[0], v = _param[1];
@@ -277,68 +276,82 @@ function _renderHandler() {
           response = null;
           serverManifest = options.serverManifest;
           ssrByRouteIds = (_options_config_server = options.config.server) === null || _options_config_server === void 0 ? void 0 : _options_config_server.ssrByRouteIds;
-          if (serverManifest.nestedRoutesJson && ssrByRouteIds && (ssrByRouteIds === null || ssrByRouteIds === void 0 ? void 0 : ssrByRouteIds.length) > 0) {
-            nestedRoutesJson = serverManifest.nestedRoutesJson;
-            routes = nestedRoutesJson === null || nestedRoutesJson === void 0 ? void 0 : nestedRoutesJson[options.routeInfo.entryName];
-            if (routes) {
-              url = new URL(request.url);
-              matchedRoutes = matchRoutes(routes, url.pathname, options.routeInfo.urlPath);
-              if (!matchedRoutes) {
-                response = csrRender(options.html);
-              } else {
-                ;
-                lastMatch = matchedRoutes[matchedRoutes.length - 1];
-                if (!(lastMatch === null || lastMatch === void 0 ? void 0 : (_lastMatch_route = lastMatch.route) === null || _lastMatch_route === void 0 ? void 0 : _lastMatch_route.id) || !ssrByRouteIds.includes(lastMatch.route.id)) {
-                  response = csrRender(options.html);
-                }
-              }
+          if (!(serverManifest.nestedRoutesJson && ssrByRouteIds && (ssrByRouteIds === null || ssrByRouteIds === void 0 ? void 0 : ssrByRouteIds.length) > 0))
+            return [
+              3,
+              2
+            ];
+          nestedRoutesJson = serverManifest.nestedRoutesJson;
+          routes = nestedRoutesJson === null || nestedRoutesJson === void 0 ? void 0 : nestedRoutesJson[options.routeInfo.entryName];
+          if (!routes)
+            return [
+              3,
+              2
+            ];
+          return [
+            4,
+            import("@modern-js/runtime-utils/remix-router")
+          ];
+        case 1:
+          matchRoutes = _state.sent().matchRoutes;
+          url = new URL(request.url);
+          matchedRoutes = matchRoutes(routes, url.pathname, options.routeInfo.urlPath);
+          if (!matchedRoutes) {
+            response = csrRender(options.html);
+          } else {
+            ;
+            lastMatch = matchedRoutes[matchedRoutes.length - 1];
+            if (!(lastMatch === null || lastMatch === void 0 ? void 0 : (_lastMatch_route = lastMatch.route) === null || _lastMatch_route === void 0 ? void 0 : _lastMatch_route.id) || !ssrByRouteIds.includes(lastMatch.route.id)) {
+              response = csrRender(options.html);
             }
           }
+          _state.label = 2;
+        case 2:
           if (!(mode === "ssr" && !response))
             return [
               3,
-              6
+              8
             ];
-          _state.label = 1;
-        case 1:
+          _state.label = 3;
+        case 3:
           _state.trys.push([
-            1,
             3,
+            5,
             ,
-            5
+            7
           ]);
           return [
             4,
             ssrRender(request, options)
           ];
-        case 2:
+        case 4:
           response = _state.sent();
           return [
             3,
-            5
+            7
           ];
-        case 3:
+        case 5:
           e = _state.sent();
           return [
             4,
             onError(e)
           ];
-        case 4:
+        case 6:
           _state.sent();
           response = csrRender(options.html);
           return [
             3,
-            5
+            7
           ];
-        case 5:
+        case 7:
           return [
             3,
-            7
+            9
           ];
-        case 6:
+        case 8:
           response = csrRender(options.html);
-          _state.label = 7;
-        case 7:
+          _state.label = 9;
+        case 9:
           newRes = transformResponse(response, injectServerData(serverData));
           routeInfo = options.routeInfo;
           applyExtendHeaders(newRes, routeInfo);

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

@@ -1,6 +1,5 @@
 import { cutNameByHyphen } from "@modern-js/utils/universal";
 import { TrieRouter } from "hono/router/trie-router";
-import { matchRoutes } from "@modern-js/runtime-utils/router";
 import { parseQuery, getPathname, createErrorHtml, sortRoutes, transformResponse, onError as onErrorFn, ErrorDigest, parseHeaders } from "../../utils";
 import { REPLACE_REG, X_MODERNJS_RENDER } from "../../constants";
 import { dataHandler } from "./dataHandler";
@@ -132,6 +131,7 @@ async function renderHandler(request, options, mode, onError) {
     const { nestedRoutesJson } = serverManifest;
     const routes = nestedRoutesJson === null || nestedRoutesJson === void 0 ? void 0 : nestedRoutesJson[options.routeInfo.entryName];
     if (routes) {
+      const { matchRoutes } = await import("@modern-js/runtime-utils/remix-router");
       const url = new URL(request.url);
       const matchedRoutes = matchRoutes(routes, url.pathname, options.routeInfo.urlPath);
       if (!matchedRoutes) {

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.57.0",
+  "version": "2.57.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -52,9 +52,9 @@
     "@web-std/file": "^3.0.3",
     "hono": "^3.12.2",
     "ts-deepmerge": "7.0.0",
-    "@modern-js/plugin": "2.57.0",
-    "@modern-js/runtime-utils": "2.57.0",
-    "@modern-js/utils": "2.57.0"
+    "@modern-js/plugin": "2.57.1",
+    "@modern-js/runtime-utils": "2.57.1",
+    "@modern-js/utils": "2.57.1"
   },
   "devDependencies": {
     "@types/jest": "^29",
@@ -64,9 +64,9 @@
     "jest": "^29",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
-    "@modern-js/types": "2.57.0",
-    "@scripts/build": "2.57.0",
-    "@scripts/jest-config": "2.57.0"
+    "@modern-js/types": "2.57.1",
+    "@scripts/build": "2.57.1",
+    "@scripts/jest-config": "2.57.1"
   },
   "sideEffects": false,
   "publishConfig": {