@modern-js/runtime 2.58.3 → 2.58.4-alpha.1

package/dist/cjs/router/cli/code/index.js

@@ -84,7 +84,7 @@ const generateCode = async (appContext, config, entrypoints, api) => {
         const config2 = api.useResolvedConfigContext();
         const ssrByRouteIds = config2.server.ssrByRouteIds || [];
         const clonedRoutes = (0, import_lodash.cloneDeep)(initialRoutes);
-        const markedRoutes = ssrByRouteIds.length > 0 ? markRoutes(clonedRoutes, ssrByRouteIds) : initialRoutes;
+        const markedRoutes = ssrByRouteIds.length > 0 ? (0, import_utils.markRoutes)(clonedRoutes, ssrByRouteIds) : initialRoutes;
         const { routes } = await hookRunners.modifyFileSystemRoutes({
           entrypoint,
           routes: markedRoutes
@@ -115,7 +115,7 @@ const generateCode = async (appContext, config, entrypoints, api) => {
           })
         });
         if (entrypoint.nestedRoutesEntry && (0, import_utils.isUseSSRBundle)(config2)) {
-          var _config_output1;
+          var _config_output1, _config_output2;
           const routesServerFile = (0, import_utils2.getServerLoadersFile)(internalDirectory, entryName);
           const filtedRoutesForServer = (0, import_utils.filterRoutesForServer)(routes);
           const routesForServerLoaderMatches = (0, import_utils.filterRoutesLoader)(routes);
@@ -134,6 +134,16 @@ const generateCode = async (appContext, config, entrypoints, api) => {
             splitRouteChunks: config2 === null || config2 === void 0 ? void 0 : (_config_output1 = config2.output) === null || _config_output1 === void 0 ? void 0 : _config_output1.splitRouteChunks
           });
           await import_utils.fs.outputFile(import_path.default.resolve(internalDirectory, `./${entryName}/routes.server.js`), serverRoutesCode, "utf8");
+          const mfServerRoutesCode = await templates.fileSystemRoutes({
+            metaName,
+            routes,
+            ssrMode: useSSG ? "string" : mode,
+            nestedRoutesEntry: entrypoint.nestedRoutesEntry,
+            entryName: entrypoint.entryName,
+            internalDirectory,
+            splitRouteChunks: config2 === null || config2 === void 0 ? void 0 : (_config_output2 = config2.output) === null || _config_output2 === void 0 ? void 0 : _config_output2.splitRouteChunks
+          });
+          await import_utils.fs.outputFile(import_path.default.resolve(internalDirectory, `./${entryName}/mf-routes.js`), mfServerRoutesCode, "utf8");
         }
         const serverLoaderCombined = templates.ssrLoaderCombinedModule(entrypoints, entrypoint, config2, appContext);
         if (serverLoaderCombined) {
@@ -145,25 +155,6 @@ const generateCode = async (appContext, config, entrypoints, api) => {
     }
   }
 };
-function markRoutes(routes, routeIds) {
-  return routes.map((route) => {
-    if (route.type !== "nested") {
-      return route;
-    }
-    if (route.children && route.children.length > 0) {
-      route.children = markRoutes(route.children, routeIds);
-    }
-    if (route.children && route.children.length > 0) {
-      route.inValidSSRRoute = route.children.every((child) => {
-        var _child_inValidSSRRoute;
-        return (_child_inValidSSRRoute = child.inValidSSRRoute) !== null && _child_inValidSSRRoute !== void 0 ? _child_inValidSSRRoute : false;
-      });
-    } else if (route.id) {
-      route.inValidSSRRoute = !routeIds.includes(route.id);
-    }
-    return route;
-  });
-}
 function generatorRegisterCode(internalDirectory, entryName, code) {
   import_utils.fs.outputFileSync(import_path.default.resolve(internalDirectory, `./${entryName}/${import_constants.ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME}`), code, "utf8");
 }

package/dist/esm/router/cli/code/index.js

@@ -1,7 +1,7 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
-import { fs, filterRoutesForServer, filterRoutesLoader, getEntryOptions, isRouterV5, isSSGEntry, isUseSSRBundle, logger } from "@modern-js/utils";
+import { fs, filterRoutesForServer, filterRoutesLoader, getEntryOptions, isRouterV5, isSSGEntry, isUseSSRBundle, logger, markRoutes } from "@modern-js/utils";
 import { cloneDeep } from "@modern-js/utils/lodash";
 import { ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME } from "../../../cli/constants";
 import { FILE_SYSTEM_ROUTES_FILE_NAME } from "../constants";
@@ -17,7 +17,7 @@ var generateCode = function() {
     }
     function _generateEntryCode() {
       _generateEntryCode = _async_to_generator(function(entrypoint) {
-        var entryName, isMainEntry, isAutoMount, pageRoutesEntry, nestedRoutesEntry, metaName, _config_output, initialRoutes, nestedRoutes, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, route, _$config, ssrByRouteIds, clonedRoutes, markedRoutes, routes, ssr, useSSG, mode, hasPageRoute, code, _, _tmp, _config_output1, routesServerFile, filtedRoutesForServer, routesForServerLoaderMatches, code1, serverRoutesCode, serverLoaderCombined, serverLoaderFile;
+        var entryName, isMainEntry, isAutoMount, pageRoutesEntry, nestedRoutesEntry, metaName, _config_output, initialRoutes, nestedRoutes, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, route, _$config, ssrByRouteIds, clonedRoutes, markedRoutes, routes, ssr, useSSG, mode, hasPageRoute, code, _, _tmp, _config_output1, _config_output2, routesServerFile, filtedRoutesForServer, routesForServerLoaderMatches, code1, serverRoutesCode, mfServerRoutesCode, serverLoaderCombined, serverLoaderFile;
         return _ts_generator(this, function(_state) {
           switch (_state.label) {
             case 0:
@@ -26,12 +26,12 @@ var generateCode = function() {
               if (!isAutoMount)
                 return [
                   3,
-                  14
+                  16
                 ];
               if (!(pageRoutesEntry || nestedRoutesEntry))
                 return [
                   3,
-                  14
+                  16
                 ];
               initialRoutes = [];
               nestedRoutes = null;
@@ -142,7 +142,7 @@ var generateCode = function() {
               if (!(entrypoint.nestedRoutesEntry && isUseSSRBundle(_$config)))
                 return [
                   3,
-                  10
+                  12
                 ];
               routesServerFile = getServerLoadersFile(internalDirectory, entryName);
               filtedRoutesForServer = filterRoutesForServer(routes);
@@ -182,31 +182,51 @@ var generateCode = function() {
               ];
             case 9:
               _state.sent();
-              _state.label = 10;
+              return [
+                4,
+                templates.fileSystemRoutes({
+                  metaName,
+                  routes,
+                  ssrMode: useSSG ? "string" : mode,
+                  nestedRoutesEntry: entrypoint.nestedRoutesEntry,
+                  entryName: entrypoint.entryName,
+                  internalDirectory,
+                  splitRouteChunks: _$config === null || _$config === void 0 ? void 0 : (_config_output2 = _$config.output) === null || _config_output2 === void 0 ? void 0 : _config_output2.splitRouteChunks
+                })
+              ];
             case 10:
+              mfServerRoutesCode = _state.sent();
+              return [
+                4,
+                fs.outputFile(path.resolve(internalDirectory, "./".concat(entryName, "/mf-routes.js")), mfServerRoutesCode, "utf8")
+              ];
+            case 11:
+              _state.sent();
+              _state.label = 12;
+            case 12:
               serverLoaderCombined = templates.ssrLoaderCombinedModule(entrypoints, entrypoint, _$config, appContext);
               if (!serverLoaderCombined)
                 return [
                   3,
-                  12
+                  14
                 ];
               serverLoaderFile = getServerCombinedModueFile(internalDirectory, entryName);
               return [
                 4,
                 fs.outputFile(serverLoaderFile, serverLoaderCombined)
               ];
-            case 11:
+            case 13:
               _state.sent();
-              _state.label = 12;
-            case 12:
+              _state.label = 14;
+            case 14:
               return [
                 4,
                 fs.outputFile(path.resolve(internalDirectory, "./".concat(entryName, "/").concat(FILE_SYSTEM_ROUTES_FILE_NAME)), code, "utf8")
               ];
-            case 13:
+            case 15:
               _state.sent();
-              _state.label = 14;
-            case 14:
+              _state.label = 16;
+            case 16:
               return [
                 2
               ];
@@ -239,25 +259,6 @@ var generateCode = function() {
     return _ref.apply(this, arguments);
   };
 }();
-function markRoutes(routes, routeIds) {
-  return routes.map(function(route) {
-    if (route.type !== "nested") {
-      return route;
-    }
-    if (route.children && route.children.length > 0) {
-      route.children = markRoutes(route.children, routeIds);
-    }
-    if (route.children && route.children.length > 0) {
-      route.inValidSSRRoute = route.children.every(function(child) {
-        var _child_inValidSSRRoute;
-        return (_child_inValidSSRRoute = child.inValidSSRRoute) !== null && _child_inValidSSRRoute !== void 0 ? _child_inValidSSRRoute : false;
-      });
-    } else if (route.id) {
-      route.inValidSSRRoute = !routeIds.includes(route.id);
-    }
-    return route;
-  });
-}
 function generatorRegisterCode(internalDirectory, entryName, code) {
   fs.outputFileSync(path.resolve(internalDirectory, "./".concat(entryName, "/").concat(ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME)), code, "utf8");
 }

package/dist/esm-node/router/cli/code/index.js

@@ -1,5 +1,5 @@
 import path from "path";
-import { fs, filterRoutesForServer, filterRoutesLoader, getEntryOptions, isRouterV5, isSSGEntry, isUseSSRBundle, logger } from "@modern-js/utils";
+import { fs, filterRoutesForServer, filterRoutesLoader, getEntryOptions, isRouterV5, isSSGEntry, isUseSSRBundle, logger, markRoutes } from "@modern-js/utils";
 import { cloneDeep } from "@modern-js/utils/lodash";
 import { ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME } from "../../../cli/constants";
 import { FILE_SYSTEM_ROUTES_FILE_NAME } from "../constants";
@@ -81,7 +81,7 @@ const generateCode = async (appContext, config, entrypoints, api) => {
           })
         });
         if (entrypoint.nestedRoutesEntry && isUseSSRBundle(config2)) {
-          var _config_output1;
+          var _config_output1, _config_output2;
           const routesServerFile = getServerLoadersFile(internalDirectory, entryName);
           const filtedRoutesForServer = filterRoutesForServer(routes);
           const routesForServerLoaderMatches = filterRoutesLoader(routes);
@@ -100,6 +100,16 @@ const generateCode = async (appContext, config, entrypoints, api) => {
             splitRouteChunks: config2 === null || config2 === void 0 ? void 0 : (_config_output1 = config2.output) === null || _config_output1 === void 0 ? void 0 : _config_output1.splitRouteChunks
           });
           await fs.outputFile(path.resolve(internalDirectory, `./${entryName}/routes.server.js`), serverRoutesCode, "utf8");
+          const mfServerRoutesCode = await templates.fileSystemRoutes({
+            metaName,
+            routes,
+            ssrMode: useSSG ? "string" : mode,
+            nestedRoutesEntry: entrypoint.nestedRoutesEntry,
+            entryName: entrypoint.entryName,
+            internalDirectory,
+            splitRouteChunks: config2 === null || config2 === void 0 ? void 0 : (_config_output2 = config2.output) === null || _config_output2 === void 0 ? void 0 : _config_output2.splitRouteChunks
+          });
+          await fs.outputFile(path.resolve(internalDirectory, `./${entryName}/mf-routes.js`), mfServerRoutesCode, "utf8");
         }
         const serverLoaderCombined = templates.ssrLoaderCombinedModule(entrypoints, entrypoint, config2, appContext);
         if (serverLoaderCombined) {
@@ -111,25 +121,6 @@ const generateCode = async (appContext, config, entrypoints, api) => {
     }
   }
 };
-function markRoutes(routes, routeIds) {
-  return routes.map((route) => {
-    if (route.type !== "nested") {
-      return route;
-    }
-    if (route.children && route.children.length > 0) {
-      route.children = markRoutes(route.children, routeIds);
-    }
-    if (route.children && route.children.length > 0) {
-      route.inValidSSRRoute = route.children.every((child) => {
-        var _child_inValidSSRRoute;
-        return (_child_inValidSSRRoute = child.inValidSSRRoute) !== null && _child_inValidSSRRoute !== void 0 ? _child_inValidSSRRoute : false;
-      });
-    } else if (route.id) {
-      route.inValidSSRRoute = !routeIds.includes(route.id);
-    }
-    return route;
-  });
-}
 function generatorRegisterCode(internalDirectory, entryName, code) {
   fs.outputFileSync(path.resolve(internalDirectory, `./${entryName}/${ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME}`), code, "utf8");
 }

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.58.3",
+  "version": "2.58.4-alpha.1",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -199,11 +199,11 @@
     "react-is": "^18",
     "react-side-effect": "^2.1.1",
     "styled-components": "^5.3.1",
-    "@modern-js/plugin": "2.58.3",
     "@modern-js/plugin-data-loader": "2.58.3",
-    "@modern-js/types": "2.58.3",
+    "@modern-js/plugin": "2.58.3",
+    "@modern-js/utils": "2.58.4-alpha.0",
     "@modern-js/runtime-utils": "2.58.3",
-    "@modern-js/utils": "2.58.3"
+    "@modern-js/types": "2.58.3"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -226,10 +226,10 @@
     "ts-jest": "^29.1.0",
     "typescript": "^5",
     "webpack": "^5.93.0",
+    "@modern-js/core": "2.58.3",
     "@modern-js/app-tools": "2.58.3",
-    "@scripts/jest-config": "2.58.3",
     "@scripts/build": "2.58.3",
-    "@modern-js/core": "2.58.3"
+    "@scripts/jest-config": "2.58.3"
   },
   "sideEffects": false,
   "publishConfig": {