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

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

@@ -34,6 +34,7 @@ __export(code_exports, {
 module.exports = __toCommonJS(code_exports);
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
+var import_route = require("@modern-js/utils/universal/route");
 var import_lodash = require("@modern-js/utils/lodash");
 var import_constants = require("../../../cli/constants");
 var import_constants2 = require("../constants");
@@ -84,7 +85,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 ? (0, import_utils.markRoutes)(clonedRoutes, ssrByRouteIds) : initialRoutes;
+        const markedRoutes = ssrByRouteIds.length > 0 ? (0, import_route.markRoutes)(clonedRoutes, ssrByRouteIds) : initialRoutes;
         const { routes } = await hookRunners.modifyFileSystemRoutes({
           entrypoint,
           routes: markedRoutes
@@ -117,8 +118,8 @@ const generateCode = async (appContext, config, entrypoints, api) => {
         if (entrypoint.nestedRoutesEntry && (0, import_utils.isUseSSRBundle)(config2)) {
           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);
+          const filtedRoutesForServer = (0, import_route.filterRoutesForServer)(routes);
+          const routesForServerLoaderMatches = (0, import_route.filterRoutesLoader)(routes);
           const code2 = templates.routesForServer({
             routesForServerLoaderMatches
           });

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

@@ -37,6 +37,7 @@ __export(cli_exports, {
 module.exports = __toCommonJS(cli_exports);
 var import_node_path = __toESM(require("node:path"));
 var import_utils = require("@modern-js/utils");
+var import_route = require("@modern-js/utils/universal/route");
 var import_entry = require("./entry");
 var import_handler = require("./handler");
 var import_entry2 = require("./entry");
@@ -115,7 +116,7 @@ const routerPlugin = () => ({
       },
       async modifyFileSystemRoutes({ entrypoint, routes }) {
         nestedRoutes[entrypoint.entryName] = routes;
-        nestedRoutesForServer[entrypoint.entryName] = (0, import_utils.filterRoutesForServer)(routes);
+        nestedRoutesForServer[entrypoint.entryName] = (0, import_route.filterRoutesForServer)(routes);
         return {
           entrypoint,
           routes

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

@@ -1,7 +1,8 @@
 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, markRoutes } from "@modern-js/utils";
+import { fs, getEntryOptions, isRouterV5, isSSGEntry, isUseSSRBundle, logger } from "@modern-js/utils";
+import { filterRoutesForServer, filterRoutesLoader, markRoutes } from "@modern-js/utils/universal/route";
 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";

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

@@ -3,7 +3,8 @@ import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "node:path";
-import { fs, NESTED_ROUTE_SPEC_FILE, createRuntimeExportsUtils, filterRoutesForServer, getEntryOptions, isRouterV5 as isV5 } from "@modern-js/utils";
+import { fs, NESTED_ROUTE_SPEC_FILE, createRuntimeExportsUtils, getEntryOptions, isRouterV5 as isV5 } from "@modern-js/utils";
+import { filterRoutesForServer } from "@modern-js/utils/universal/route";
 import { isRouteEntry } from "./entry";
 import { handleFileChange, handleGeneratorEntryCode, handleModifyEntrypoints } from "./handler";
 import { isRouteEntry as isRouteEntry2 } from "./entry";

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

@@ -1,5 +1,6 @@
 import path from "path";
-import { fs, filterRoutesForServer, filterRoutesLoader, getEntryOptions, isRouterV5, isSSGEntry, isUseSSRBundle, logger, markRoutes } from "@modern-js/utils";
+import { fs, getEntryOptions, isRouterV5, isSSGEntry, isUseSSRBundle, logger } from "@modern-js/utils";
+import { filterRoutesForServer, filterRoutesLoader, markRoutes } from "@modern-js/utils/universal/route";
 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";

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

@@ -1,5 +1,6 @@
 import path from "node:path";
-import { fs, NESTED_ROUTE_SPEC_FILE, createRuntimeExportsUtils, filterRoutesForServer, getEntryOptions, isRouterV5 as isV5 } from "@modern-js/utils";
+import { fs, NESTED_ROUTE_SPEC_FILE, createRuntimeExportsUtils, getEntryOptions, isRouterV5 as isV5 } from "@modern-js/utils";
+import { filterRoutesForServer } from "@modern-js/utils/universal/route";
 import { isRouteEntry } from "./entry";
 import { handleFileChange, handleGeneratorEntryCode, handleModifyEntrypoints } from "./handler";
 import { isRouteEntry as isRouteEntry2 } from "./entry";

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.58.4-alpha.1",
+  "version": "2.58.4-alpha.2",
   "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-data-loader": "2.58.3",
     "@modern-js/plugin": "2.58.3",
-    "@modern-js/utils": "2.58.4-alpha.0",
+    "@modern-js/types": "2.58.3",
     "@modern-js/runtime-utils": "2.58.3",
-    "@modern-js/types": "2.58.3"
+    "@modern-js/plugin-data-loader": "2.58.3",
+    "@modern-js/utils": "2.58.4-alpha.2"
   },
   "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/build": "2.58.3",
-    "@scripts/jest-config": "2.58.3"
+    "@modern-js/core": "2.58.3",
+    "@scripts/jest-config": "2.58.3",
+    "@scripts/build": "2.58.3"
   },
   "sideEffects": false,
   "publishConfig": {