@modern-js/runtime 2.60.1-alpha.3 → 2.60.1-alpha.5

package/dist/cjs/cli/index.js

@@ -125,10 +125,10 @@ const runtimePlugin = (params) => ({
               * Compatible with the reference path of the old version of the plugin.
               */
               [`@${metaName}/runtime/plugins`]: pluginsExportsUtils.getPath(),
-              "@meta/runtime/browser": require.resolve("../core/browser"),
-              "@meta/runtime/react": require.resolve("../core/react"),
-              "@meta/runtime/context": require.resolve("../core/context"),
-              "@meta/runtime": require.resolve("@modern-js/runtime")
+              "@meta/runtime/browser$": require.resolve("../core/browser").replace("/cjs/", "/esm/"),
+              "@meta/runtime/react$": require.resolve("../core/react").replace("/cjs/", "/esm/"),
+              "@meta/runtime/context$": require.resolve("../core/context").replace("/cjs/", "/esm/"),
+              "@meta/runtime$": require.resolve("../index").replace("/cjs/", "/esm/")
             },
             globalVars: {
               "process.env.IS_REACT18": process.env.IS_REACT18

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

@@ -34,14 +34,14 @@ __export(code_exports, {
 module.exports = __toCommonJS(code_exports);
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
+var import_utils2 = require("@modern-js/utils");
 var import_lodash = require("@modern-js/utils/lodash");
-var import_route = require("@modern-js/utils/universal/route");
 var import_constants = require("../../../cli/constants");
 var import_constants2 = require("../constants");
 var import_getClientRoutes = require("./getClientRoutes");
 var import_nestedRoutes = require("./nestedRoutes");
 var templates = __toESM(require("./templates"));
-var import_utils2 = require("./utils");
+var import_utils3 = require("./utils");
 const generateCode = async (appContext, config, entrypoints, api) => {
   const { internalDirectory, srcDirectory, internalDirAlias, internalSrcAlias, packageName } = appContext;
   const hookRunners = api.useHookRunners();
@@ -85,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_route.markRoutes)(clonedRoutes, ssrByRouteIds) : initialRoutes;
+        const markedRoutes = ssrByRouteIds.length > 0 ? (0, import_utils2.markRoutes)(clonedRoutes, ssrByRouteIds) : initialRoutes;
         const { routes } = await hookRunners.modifyFileSystemRoutes({
           entrypoint,
           routes: markedRoutes
@@ -117,9 +117,9 @@ const generateCode = async (appContext, config, entrypoints, api) => {
         });
         if (entrypoint.nestedRoutesEntry && (0, import_utils.isUseSSRBundle)(config2)) {
           var _config_output1;
-          const routesServerFile = (0, import_utils2.getServerLoadersFile)(internalDirectory, entryName);
-          const filtedRoutesForServer = (0, import_route.filterRoutesForServer)(routes);
-          const routesForServerLoaderMatches = (0, import_route.filterRoutesLoader)(routes);
+          const routesServerFile = (0, import_utils3.getServerLoadersFile)(internalDirectory, entryName);
+          const filtedRoutesForServer = (0, import_utils2.filterRoutesForServer)(routes);
+          const routesForServerLoaderMatches = (0, import_utils2.filterRoutesLoader)(routes);
           const code2 = templates.routesForServer({
             routesForServerLoaderMatches
           });
@@ -138,7 +138,7 @@ const generateCode = async (appContext, config, entrypoints, api) => {
         }
         const serverLoaderCombined = templates.ssrLoaderCombinedModule(entrypoints, entrypoint, config2, appContext);
         if (serverLoaderCombined) {
-          const serverLoaderFile = (0, import_utils2.getServerCombinedModueFile)(internalDirectory, entryName);
+          const serverLoaderFile = (0, import_utils3.getServerCombinedModueFile)(internalDirectory, entryName);
           await import_utils.fs.outputFile(serverLoaderFile, serverLoaderCombined);
         }
         await import_utils.fs.outputFile(import_path.default.resolve(internalDirectory, `./${entryName}/${import_constants2.FILE_SYSTEM_ROUTES_FILE_NAME}`), code, "utf8");

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

@@ -37,7 +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_utils2 = require("@modern-js/utils");
 var import_entry = require("./entry");
 var import_handler = require("./handler");
 var import_entry2 = require("./entry");
@@ -116,7 +116,7 @@ const routerPlugin = () => ({
       },
       async modifyFileSystemRoutes({ entrypoint, routes }) {
         nestedRoutes[entrypoint.entryName] = routes;
-        nestedRoutesForServer[entrypoint.entryName] = (0, import_route.filterRoutesForServer)(routes);
+        nestedRoutesForServer[entrypoint.entryName] = (0, import_utils2.filterRoutesForServer)(routes);
         return {
           entrypoint,
           routes

package/dist/esm/cli/index.js

@@ -109,7 +109,7 @@ var runtimePlugin = function(params) {
               }, /**
               * Compatible with the reference path of the old version of the plugin.
               */
-              _define_property(_obj, "@".concat(metaName, "/runtime/plugins"), pluginsExportsUtils.getPath()), _define_property(_obj, "@meta/runtime/browser", require.resolve("../core/browser")), _define_property(_obj, "@meta/runtime/react", require.resolve("../core/react")), _define_property(_obj, "@meta/runtime/context", require.resolve("../core/context")), _define_property(_obj, "@meta/runtime", require.resolve("@modern-js/runtime")), _obj),
+              _define_property(_obj, "@".concat(metaName, "/runtime/plugins"), pluginsExportsUtils.getPath()), _define_property(_obj, "@meta/runtime/browser$", require.resolve("../core/browser").replace("/cjs/", "/esm/")), _define_property(_obj, "@meta/runtime/react$", require.resolve("../core/react").replace("/cjs/", "/esm/")), _define_property(_obj, "@meta/runtime/context$", require.resolve("../core/context").replace("/cjs/", "/esm/")), _define_property(_obj, "@meta/runtime$", require.resolve("../index").replace("/cjs/", "/esm/")), _obj),
               globalVars: {
                 "process.env.IS_REACT18": process.env.IS_REACT18
               }

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

@@ -3,8 +3,8 @@ import { _ as _type_of } from "@swc/helpers/_/_type_of";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
 import { fs, getEntryOptions, isRouterV5, isSSGEntry, isUseSSRBundle, logger } from "@modern-js/utils";
+import { filterRoutesForServer, filterRoutesLoader, markRoutes } from "@modern-js/utils";
 import { cloneDeep } from "@modern-js/utils/lodash";
-import { filterRoutesForServer, filterRoutesLoader, markRoutes } from "@modern-js/utils/universal/route";
 import { ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME } from "../../../cli/constants";
 import { FILE_SYSTEM_ROUTES_FILE_NAME } from "../constants";
 import { getClientRoutes, getClientRoutesLegacy } from "./getClientRoutes";

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

@@ -4,7 +4,7 @@ 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, getEntryOptions, isRouterV5 as isV5 } from "@modern-js/utils";
-import { filterRoutesForServer } from "@modern-js/utils/universal/route";
+import { filterRoutesForServer } from "@modern-js/utils";
 import { isRouteEntry } from "./entry";
 import { handleFileChange, handleGeneratorEntryCode, handleModifyEntrypoints } from "./handler";
 import { isRouteEntry as isRouteEntry2 } from "./entry";

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

@@ -86,10 +86,10 @@ const runtimePlugin = (params) => ({
               * Compatible with the reference path of the old version of the plugin.
               */
               [`@${metaName}/runtime/plugins`]: pluginsExportsUtils.getPath(),
-              "@meta/runtime/browser": require.resolve("../core/browser"),
-              "@meta/runtime/react": require.resolve("../core/react"),
-              "@meta/runtime/context": require.resolve("../core/context"),
-              "@meta/runtime": require.resolve("@modern-js/runtime")
+              "@meta/runtime/browser$": require.resolve("../core/browser").replace("/cjs/", "/esm/"),
+              "@meta/runtime/react$": require.resolve("../core/react").replace("/cjs/", "/esm/"),
+              "@meta/runtime/context$": require.resolve("../core/context").replace("/cjs/", "/esm/"),
+              "@meta/runtime$": require.resolve("../index").replace("/cjs/", "/esm/")
             },
             globalVars: {
               "process.env.IS_REACT18": process.env.IS_REACT18

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

@@ -1,7 +1,7 @@
 import path from "path";
 import { fs, getEntryOptions, isRouterV5, isSSGEntry, isUseSSRBundle, logger } from "@modern-js/utils";
+import { filterRoutesForServer, filterRoutesLoader, markRoutes } from "@modern-js/utils";
 import { cloneDeep } from "@modern-js/utils/lodash";
-import { filterRoutesForServer, filterRoutesLoader, markRoutes } from "@modern-js/utils/universal/route";
 import { ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME } from "../../../cli/constants";
 import { FILE_SYSTEM_ROUTES_FILE_NAME } from "../constants";
 import { getClientRoutes, getClientRoutesLegacy } from "./getClientRoutes";

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

@@ -1,6 +1,6 @@
 import path from "node:path";
 import { fs, NESTED_ROUTE_SPEC_FILE, createRuntimeExportsUtils, getEntryOptions, isRouterV5 as isV5 } from "@modern-js/utils";
-import { filterRoutesForServer } from "@modern-js/utils/universal/route";
+import { filterRoutesForServer } from "@modern-js/utils";
 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.60.1-alpha.3",
+  "version": "2.60.1-alpha.5",
   "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.60.0",
     "@modern-js/plugin": "2.60.0",
-    "@modern-js/utils": "2.60.0",
+    "@modern-js/runtime-utils": "2.60.0",
     "@modern-js/types": "2.60.0",
-    "@modern-js/runtime-utils": "2.60.0"
+    "@modern-js/utils": "2.60.1-alpha.0",
+    "@modern-js/plugin-data-loader": "2.60.0"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -226,10 +226,10 @@
     "ts-jest": "^29.1.0",
     "typescript": "^5",
     "webpack": "^5.94.0",
-    "@scripts/build": "2.60.0",
+    "@modern-js/core": "2.60.0",
     "@modern-js/app-tools": "2.60.0",
-    "@scripts/jest-config": "2.60.0",
-    "@modern-js/core": "2.60.0"
+    "@scripts/build": "2.60.0",
+    "@scripts/jest-config": "2.60.0"
   },
   "sideEffects": false,
   "publishConfig": {