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

package/dist/cjs/core/browser/index.js

@@ -31,9 +31,7 @@ __export(browser_exports, {
   render: () => render
 });
 module.exports = __toCommonJS(browser_exports);
-var import_parsed = require("@modern-js/runtime-utils/parsed");
 var import_cookie = __toESM(require("cookie"));
-var import_constants = require("../constants");
 var import_context = require("../context");
 var import_runtime = require("../context/runtime");
 var import_loaderManager = require("../loader/loaderManager");
@@ -92,9 +90,6 @@ async function render(App, id) {
   };
   if (isClientArgs(id)) {
     var _ssrData_data, _ssrData_data1;
-    window._SSR_DATA = window._SSR_DATA || (0, import_parsed.parsedJSONFromElement)(import_constants.SSR_DATA_JSON_ID);
-    const routeData = (0, import_parsed.parsedJSONFromElement)(import_constants.ROUTER_DATA_JSON_ID);
-    window._ROUTER_DATA = window._ROUTER_DATA || routeData;
     const ssrData = getSSRData();
     const loadersData = (ssrData === null || ssrData === void 0 ? void 0 : (_ssrData_data = ssrData.data) === null || _ssrData_data === void 0 ? void 0 : _ssrData_data.loadersData) || {};
     const initialLoadersState = Object.keys(loadersData).reduce((res, key) => {

package/dist/cjs/core/react/index.js

@@ -21,10 +21,17 @@ __export(react_exports, {
   createRoot: () => createRoot
 });
 module.exports = __toCommonJS(react_exports);
+var import_parsed = require("@modern-js/runtime-utils/parsed");
+var import_common = require("../../common");
+var import_constants = require("../constants");
 var import_context = require("../context");
 var import_runner = require("../plugin/runner");
 function createRoot(UserApp) {
   const App = UserApp || (0, import_context.getGlobalApp)();
+  if ((0, import_common.isBrowser)()) {
+    window._SSR_DATA = window._SSR_DATA || (0, import_parsed.parsedJSONFromElement)(import_constants.SSR_DATA_JSON_ID);
+    window._ROUTER_DATA = window._ROUTER_DATA || (0, import_parsed.parsedJSONFromElement)(import_constants.ROUTER_DATA_JSON_ID);
+  }
   const runner = (0, import_runner.getGlobalRunner)();
   const WrapperApp = runner.wrapRoot(App);
   return WrapperApp;

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 ? (0, import_utils.markRoutes)(clonedRoutes, ssrByRouteIds) : initialRoutes;
+        const markedRoutes = ssrByRouteIds.length > 0 ? 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, _config_output2;
+          var _config_output1;
           const routesServerFile = (0, import_utils2.getServerLoadersFile)(internalDirectory, entryName);
           const filtedRoutesForServer = (0, import_utils.filterRoutesForServer)(routes);
           const routesForServerLoaderMatches = (0, import_utils.filterRoutesLoader)(routes);
@@ -134,16 +134,6 @@ 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) {
@@ -155,6 +145,25 @@ 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/core/browser/index.js

@@ -4,9 +4,7 @@ import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { parsedJSONFromElement } from "@modern-js/runtime-utils/parsed";
 import cookieTool from "cookie";
-import { ROUTER_DATA_JSON_ID, SSR_DATA_JSON_ID } from "../constants";
 import { getGlobalAppInit } from "../context";
 import { getInitialContext } from "../context/runtime";
 import { createLoaderManager } from "../loader/loaderManager";
@@ -56,7 +54,7 @@ function render(App, id) {
 }
 function _render() {
   _render = _async_to_generator(function(App, id) {
-    var runner, context, runBeforeRender, ModernRender, ModernHydrate, _ssrData_data, _ssrData_data1, routeData, ssrData, loadersData, initialLoadersState, initialData, rootElement;
+    var runner, context, runBeforeRender, ModernRender, ModernHydrate, _ssrData_data, _ssrData_data1, ssrData, loadersData, initialLoadersState, initialData, rootElement;
     function _ModernRender() {
       _ModernRender = _async_to_generator(function(App2) {
         var renderFunc;
@@ -123,9 +121,6 @@ function _render() {
           ModernHydrate = function ModernHydrate2(App2, callback) {
             return _ModernHydrate.apply(this, arguments);
           };
-          window._SSR_DATA = window._SSR_DATA || parsedJSONFromElement(SSR_DATA_JSON_ID);
-          routeData = parsedJSONFromElement(ROUTER_DATA_JSON_ID);
-          window._ROUTER_DATA = window._ROUTER_DATA || routeData;
           ssrData = getSSRData();
           loadersData = (ssrData === null || ssrData === void 0 ? void 0 : (_ssrData_data = ssrData.data) === null || _ssrData_data === void 0 ? void 0 : _ssrData_data.loadersData) || {};
           initialLoadersState = Object.keys(loadersData).reduce(function(res, key) {

package/dist/esm/core/react/index.js

@@ -1,7 +1,14 @@
+import { parsedJSONFromElement } from "@modern-js/runtime-utils/parsed";
+import { isBrowser } from "../../common";
+import { ROUTER_DATA_JSON_ID, SSR_DATA_JSON_ID } from "../constants";
 import { getGlobalApp } from "../context";
 import { getGlobalRunner } from "../plugin/runner";
 function createRoot(UserApp) {
   var App = UserApp || getGlobalApp();
+  if (isBrowser()) {
+    window._SSR_DATA = window._SSR_DATA || parsedJSONFromElement(SSR_DATA_JSON_ID);
+    window._ROUTER_DATA = window._ROUTER_DATA || parsedJSONFromElement(ROUTER_DATA_JSON_ID);
+  }
   var runner = getGlobalRunner();
   var WrapperApp = runner.wrapRoot(App);
   return WrapperApp;

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, markRoutes } from "@modern-js/utils";
+import { fs, filterRoutesForServer, filterRoutesLoader, getEntryOptions, isRouterV5, isSSGEntry, isUseSSRBundle, logger } 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, _config_output2, routesServerFile, filtedRoutesForServer, routesForServerLoaderMatches, code1, serverRoutesCode, mfServerRoutesCode, 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, routesServerFile, filtedRoutesForServer, routesForServerLoaderMatches, code1, serverRoutesCode, serverLoaderCombined, serverLoaderFile;
         return _ts_generator(this, function(_state) {
           switch (_state.label) {
             case 0:
@@ -26,12 +26,12 @@ var generateCode = function() {
               if (!isAutoMount)
                 return [
                   3,
-                  16
+                  14
                 ];
               if (!(pageRoutesEntry || nestedRoutesEntry))
                 return [
                   3,
-                  16
+                  14
                 ];
               initialRoutes = [];
               nestedRoutes = null;
@@ -142,7 +142,7 @@ var generateCode = function() {
               if (!(entrypoint.nestedRoutesEntry && isUseSSRBundle(_$config)))
                 return [
                   3,
-                  12
+                  10
                 ];
               routesServerFile = getServerLoadersFile(internalDirectory, entryName);
               filtedRoutesForServer = filterRoutesForServer(routes);
@@ -182,51 +182,31 @@ var generateCode = function() {
               ];
             case 9:
               _state.sent();
-              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
-                })
-              ];
+              _state.label = 10;
             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,
-                  14
+                  12
                 ];
               serverLoaderFile = getServerCombinedModueFile(internalDirectory, entryName);
               return [
                 4,
                 fs.outputFile(serverLoaderFile, serverLoaderCombined)
               ];
-            case 13:
+            case 11:
               _state.sent();
-              _state.label = 14;
-            case 14:
+              _state.label = 12;
+            case 12:
               return [
                 4,
                 fs.outputFile(path.resolve(internalDirectory, "./".concat(entryName, "/").concat(FILE_SYSTEM_ROUTES_FILE_NAME)), code, "utf8")
               ];
-            case 15:
+            case 13:
               _state.sent();
-              _state.label = 16;
-            case 16:
+              _state.label = 14;
+            case 14:
               return [
                 2
               ];
@@ -259,6 +239,25 @@ 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/core/browser/index.js

@@ -1,6 +1,4 @@
-import { parsedJSONFromElement } from "@modern-js/runtime-utils/parsed";
 import cookieTool from "cookie";
-import { ROUTER_DATA_JSON_ID, SSR_DATA_JSON_ID } from "../constants";
 import { getGlobalAppInit } from "../context";
 import { getInitialContext } from "../context/runtime";
 import { createLoaderManager } from "../loader/loaderManager";
@@ -59,9 +57,6 @@ async function render(App, id) {
   };
   if (isClientArgs(id)) {
     var _ssrData_data, _ssrData_data1;
-    window._SSR_DATA = window._SSR_DATA || parsedJSONFromElement(SSR_DATA_JSON_ID);
-    const routeData = parsedJSONFromElement(ROUTER_DATA_JSON_ID);
-    window._ROUTER_DATA = window._ROUTER_DATA || routeData;
     const ssrData = getSSRData();
     const loadersData = (ssrData === null || ssrData === void 0 ? void 0 : (_ssrData_data = ssrData.data) === null || _ssrData_data === void 0 ? void 0 : _ssrData_data.loadersData) || {};
     const initialLoadersState = Object.keys(loadersData).reduce((res, key) => {

package/dist/esm-node/core/react/index.js

@@ -1,7 +1,14 @@
+import { parsedJSONFromElement } from "@modern-js/runtime-utils/parsed";
+import { isBrowser } from "../../common";
+import { ROUTER_DATA_JSON_ID, SSR_DATA_JSON_ID } from "../constants";
 import { getGlobalApp } from "../context";
 import { getGlobalRunner } from "../plugin/runner";
 function createRoot(UserApp) {
   const App = UserApp || getGlobalApp();
+  if (isBrowser()) {
+    window._SSR_DATA = window._SSR_DATA || parsedJSONFromElement(SSR_DATA_JSON_ID);
+    window._ROUTER_DATA = window._ROUTER_DATA || parsedJSONFromElement(ROUTER_DATA_JSON_ID);
+  }
   const runner = getGlobalRunner();
   const WrapperApp = runner.wrapRoot(App);
   return WrapperApp;

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, markRoutes } from "@modern-js/utils";
+import { fs, filterRoutesForServer, filterRoutesLoader, getEntryOptions, isRouterV5, isSSGEntry, isUseSSRBundle, logger } 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, _config_output2;
+          var _config_output1;
           const routesServerFile = getServerLoadersFile(internalDirectory, entryName);
           const filtedRoutesForServer = filterRoutesForServer(routes);
           const routesForServerLoaderMatches = filterRoutesLoader(routes);
@@ -100,16 +100,6 @@ 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) {
@@ -121,6 +111,25 @@ 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/dist/types/router/runtime/withRouter.d.ts

@@ -1,8 +1,10 @@
 import { useLocation, useNavigate } from '@modern-js/runtime-utils/router';
 import type React from 'react';
-export interface WithRouterProps {
+export interface WithRouterProps<Params extends {
+    [K in keyof Params]?: string;
+} = {}> {
     location: ReturnType<typeof useLocation>;
-    params: Record<string, string>;
+    params: Params;
     navigate: ReturnType<typeof useNavigate>;
 }
-export declare const withRouter: <Props extends WithRouterProps>(Component: React.ComponentType<Props>) => (props: Omit<Props, keyof WithRouterProps>) => JSX.Element;
+export declare const withRouter: <Props extends WithRouterProps<{}>>(Component: React.ComponentType<Props>) => (props: Omit<Props, keyof WithRouterProps<{}>>) => JSX.Element;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.58.4-alpha.1",
+  "version": "2.59.0",
   "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/runtime-utils": "2.58.3",
-    "@modern-js/types": "2.58.3"
+    "@modern-js/plugin": "2.59.0",
+    "@modern-js/plugin-data-loader": "2.59.0",
+    "@modern-js/runtime-utils": "2.59.0",
+    "@modern-js/utils": "2.59.0",
+    "@modern-js/types": "2.59.0"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -211,7 +211,7 @@
   },
   "devDependencies": {
     "@remix-run/web-fetch": "^4.1.3",
-    "@rsbuild/core": "1.0.1-beta.14",
+    "@rsbuild/core": "1.0.1-rc.4",
     "@testing-library/react": "^13.4.0",
     "@types/cookie": "0.5.1",
     "@types/invariant": "^2.2.30",
@@ -225,11 +225,11 @@
     "react-dom": "^18",
     "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"
+    "webpack": "^5.94.0",
+    "@modern-js/core": "2.59.0",
+    "@scripts/build": "2.59.0",
+    "@scripts/jest-config": "2.59.0",
+    "@modern-js/app-tools": "2.59.0"
   },
   "sideEffects": false,
   "publishConfig": {