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

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

@@ -57,7 +57,7 @@ const ssrBuilderPlugin = (modernAPI) => ({
   name: "@modern-js/builder-plugin-ssr",
   setup(api) {
     api.modifyEnvironmentConfig((config, { name, mergeEnvironmentConfig }) => {
-      const isServerEnvironment = config.output.target === "node" || name === "serviceWorker";
+      const isServerEnvironment = config.output.target === "node" || name === "workerSSR";
       const userConfig = modernAPI.useResolvedConfigContext();
       const useLoadablePlugin = (0, import_utils.isUseSSRBundle)(userConfig) && !isServerEnvironment && checkUseStringSSR(userConfig);
       return mergeEnvironmentConfig(config, {

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/core/server/string/index.js

@@ -102,26 +102,26 @@ const renderString = async (request, serverRoot, options) => {
   });
 };
 async function generateHtml(App, htmlTemplate, chunkSet, collectors, htmlModifiers, { onError, onTiming }) {
-  const end = (0, import_time.time)();
   let html = "";
   let helmetData;
+  const finalApp = collectors.reduce((pre, creator) => {
+    var _creator_collect;
+    return ((_creator_collect = creator.collect) === null || _creator_collect === void 0 ? void 0 : _creator_collect.call(creator, pre)) || pre;
+  }, App);
   try {
-    const finalApp = collectors.reduce((pre, creator) => {
-      var _creator_collect;
-      return ((_creator_collect = creator.collect) === null || _creator_collect === void 0 ? void 0 : _creator_collect.call(creator, pre)) || pre;
-    }, App);
+    const end = (0, import_time.time)();
     if (chunkSet.renderLevel >= import_constants.RenderLevel.SERVER_PREFETCH) {
       html = import_server.default.renderToString(finalApp);
       chunkSet.renderLevel = import_constants.RenderLevel.SERVER_RENDER;
     }
     helmetData = import_react_helmet.default.renderStatic();
-    await Promise.all(collectors.map((component) => component.effect()));
     const cost = end();
     onTiming(import_tracer.SSRTimings.RENDER_HTML, cost);
   } catch (e) {
     chunkSet.renderLevel = import_constants.RenderLevel.CLIENT_RENDER;
     onError(import_tracer.SSRErrors.RENDER_HTML, e);
   }
+  await Promise.all(collectors.map((component) => component.effect()));
   const { ssrScripts, cssChunk, jsChunk } = chunkSet;
   const finalHtml = await (0, import_shared.buildHtml)(htmlTemplate, [
     createReplaceHtml(html),

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

@@ -34,7 +34,6 @@ __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");
@@ -85,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_route.markRoutes)(clonedRoutes, ssrByRouteIds) : initialRoutes;
+        const markedRoutes = ssrByRouteIds.length > 0 ? markRoutes(clonedRoutes, ssrByRouteIds) : initialRoutes;
         const { routes } = await hookRunners.modifyFileSystemRoutes({
           entrypoint,
           routes: markedRoutes
@@ -116,10 +115,10 @@ 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_route.filterRoutesForServer)(routes);
-          const routesForServerLoaderMatches = (0, import_route.filterRoutesLoader)(routes);
+          const filtedRoutesForServer = (0, import_utils.filterRoutesForServer)(routes);
+          const routesForServerLoaderMatches = (0, import_utils.filterRoutesLoader)(routes);
           const code2 = templates.routesForServer({
             routesForServerLoaderMatches
           });
@@ -135,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) {
@@ -156,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/cjs/router/cli/index.js

@@ -37,7 +37,6 @@ __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");
@@ -116,7 +115,7 @@ const routerPlugin = () => ({
       },
       async modifyFileSystemRoutes({ entrypoint, routes }) {
         nestedRoutes[entrypoint.entryName] = routes;
-        nestedRoutesForServer[entrypoint.entryName] = (0, import_route.filterRoutesForServer)(routes);
+        nestedRoutesForServer[entrypoint.entryName] = (0, import_utils.filterRoutesForServer)(routes);
         return {
           entrypoint,
           routes

package/dist/cjs/router/runtime/plugin.js

@@ -135,12 +135,24 @@ const routerPlugin = (userConfig = {}) => {
                 getBlockNavState
               ]);
             };
+            const Null = () => null;
             return (props) => {
               beforeCreateRouter = false;
               const router = useCreateRouter(props);
-              return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_router.RouterProvider, {
-                router
-              });
+              return (
+                // To match the node tree about https://github.com/web-infra-dev/modern.js/blob/v2.59.0/packages/runtime/plugin-runtime/src/router/runtime/plugin.node.tsx#L150-L168
+                // According to react [useId generation algorithm](https://github.com/facebook/react/pull/22644), `useId` will generate id with the react node react struct.
+                // To void hydration failed, we must guarantee that the node tree when browser hydrate must have same struct with node tree when ssr render.
+                /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, {
+                  children: [
+                    /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_router.RouterProvider, {
+                      router
+                    }),
+                    /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Null, {}),
+                    /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Null, {})
+                  ]
+                })
+              );
             };
           };
           return getRouteApp();

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

@@ -1,16 +1,17 @@
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
+import { _ as _type_of } from "@swc/helpers/_/_type_of";
 import path from "path";
 import { LOADABLE_STATS_FILE, isUseSSRBundle } from "@modern-js/utils";
 var hasStringSSREntry = function(userConfig) {
   var isStreaming = function(ssr) {
-    return ssr && typeof ssr === "object" && ssr.mode === "stream";
+    return ssr && (typeof ssr === "undefined" ? "undefined" : _type_of(ssr)) === "object" && ssr.mode === "stream";
   };
   var server = userConfig.server, output = userConfig.output;
   if (((server === null || server === void 0 ? void 0 : server.ssr) || output.ssg) && !isStreaming(server.ssr)) {
     return true;
   }
-  if ((server === null || server === void 0 ? void 0 : server.ssrByEntries) && typeof server.ssrByEntries === "object") {
+  if ((server === null || server === void 0 ? void 0 : server.ssrByEntries) && _type_of(server.ssrByEntries) === "object") {
     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
     try {
       for (var _iterator = Object.keys(server.ssrByEntries)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
@@ -46,7 +47,7 @@ var ssrBuilderPlugin = function(modernAPI) {
     setup: function setup(api) {
       api.modifyEnvironmentConfig(function(config, param) {
         var name = param.name, mergeEnvironmentConfig = param.mergeEnvironmentConfig;
-        var isServerEnvironment = config.output.target === "node" || name === "serviceWorker";
+        var isServerEnvironment = config.output.target === "node" || name === "workerSSR";
         var userConfig = modernAPI.useResolvedConfigContext();
         var useLoadablePlugin = isUseSSRBundle(userConfig) && !isServerEnvironment && checkUseStringSSR(userConfig);
         return mergeEnvironmentConfig(config, {

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/core/server/react/prerender/index.js

@@ -1,10 +1,10 @@
+import { _ as _call_super } from "@swc/helpers/_/_call_super";
 import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
 import { _ as _create_class } from "@swc/helpers/_/_create_class";
 import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { _ as _inherits } from "@swc/helpers/_/_inherits";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
-import { _ as _create_super } from "@swc/helpers/_/_create_super";
 import React, { createElement } from "react";
 import withSideEffect from "react-side-effect";
 import { aggKeysFromPropsList, aggMatchesFromPropsList, exist, getOutermostProperty } from "./util";
@@ -55,10 +55,9 @@ function factory(Component) {
   var Spr = /* @__PURE__ */ function(_React_Component) {
     "use strict";
     _inherits(Spr2, _React_Component);
-    var _super = _create_super(Spr2);
     function Spr2() {
       _class_call_check(this, Spr2);
-      return _super.apply(this, arguments);
+      return _call_super(this, Spr2, arguments);
     }
     var _proto = Spr2.prototype;
     _proto.verify = function verify() {

package/dist/esm/core/server/requestHandler.js

@@ -3,6 +3,7 @@ import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
 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 _type_of } from "@swc/helpers/_/_type_of";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { getPathname, parseCookie, parseHeaders, parseQuery } from "@modern-js/runtime-utils/universal/request";
 import { getGlobalAppInit } from "../context";
@@ -30,7 +31,7 @@ function createSSRContext(request, options) {
   }
   var ssrConfig = getSSRConfigByEntry(entryName, config.ssr, config.ssrByEntries);
   var ssrMode = getSSRMode(ssrConfig);
-  var loaderFailureMode = typeof ssrConfig === "object" ? ssrConfig.loaderFailureMode : void 0;
+  var loaderFailureMode = (typeof ssrConfig === "undefined" ? "undefined" : _type_of(ssrConfig)) === "object" ? ssrConfig.loaderFailureMode : void 0;
   return {
     nonce,
     loaderContext,

package/dist/esm/core/server/stream/afterTemplate.js

@@ -1,5 +1,6 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
+import { _ as _type_of } from "@swc/helpers/_/_type_of";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { serializeJson } from "@modern-js/runtime-utils/node";
 import { SSR_DATA_PLACEHOLDER } from "../constants";
@@ -57,7 +58,7 @@ function buildShellAfterTemplate(afterAppTemplate, options) {
 function createReplaceSSRData(options) {
   var runtimeContext = options.runtimeContext, nonce = options.nonce, renderLevel = options.renderLevel, ssrConfig = options.ssrConfig;
   var _runtimeContext_ssrContext = runtimeContext.ssrContext, request = _runtimeContext_ssrContext.request, reporter = _runtimeContext_ssrContext.reporter;
-  var headers = typeof ssrConfig === "object" && ssrConfig.unsafeHeaders ? Object.fromEntries(Object.entries(request.headers).filter(function(param) {
+  var headers = (typeof ssrConfig === "undefined" ? "undefined" : _type_of(ssrConfig)) === "object" && ssrConfig.unsafeHeaders ? Object.fromEntries(Object.entries(request.headers).filter(function(param) {
     var _param = _sliced_to_array(param, 2), key = _param[0], _ = _param[1];
     var _ssrConfig_unsafeHeaders_map, _ssrConfig_unsafeHeaders;
     return (_ssrConfig_unsafeHeaders = ssrConfig.unsafeHeaders) === null || _ssrConfig_unsafeHeaders === void 0 ? void 0 : (_ssrConfig_unsafeHeaders_map = _ssrConfig_unsafeHeaders.map(function(header) {

package/dist/esm/core/server/string/index.js

@@ -121,53 +121,37 @@ function generateHtml(App, htmlTemplate, chunkSet, collectors, htmlModifiers, _)
 }
 function _generateHtml() {
   _generateHtml = _async_to_generator(function(App, htmlTemplate, chunkSet, collectors, htmlModifiers, param) {
-    var onError, onTiming, end, html, helmetData, finalApp, cost, e, ssrScripts, cssChunk, jsChunk, finalHtml;
+    var onError, onTiming, html, helmetData, finalApp, end, cost, ssrScripts, cssChunk, jsChunk, finalHtml;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
           onError = param.onError, onTiming = param.onTiming;
-          end = time();
           html = "";
-          _state.label = 1;
-        case 1:
-          _state.trys.push([
-            1,
-            3,
-            ,
-            4
-          ]);
           finalApp = collectors.reduce(function(pre, creator) {
             var _creator_collect;
             return ((_creator_collect = creator.collect) === null || _creator_collect === void 0 ? void 0 : _creator_collect.call(creator, pre)) || pre;
           }, App);
-          if (chunkSet.renderLevel >= RenderLevel.SERVER_PREFETCH) {
-            html = ReactDomServer.renderToString(finalApp);
-            chunkSet.renderLevel = RenderLevel.SERVER_RENDER;
+          try {
+            end = time();
+            if (chunkSet.renderLevel >= RenderLevel.SERVER_PREFETCH) {
+              html = ReactDomServer.renderToString(finalApp);
+              chunkSet.renderLevel = RenderLevel.SERVER_RENDER;
+            }
+            helmetData = ReactHelmet.renderStatic();
+            cost = end();
+            onTiming(SSRTimings.RENDER_HTML, cost);
+          } catch (e) {
+            chunkSet.renderLevel = RenderLevel.CLIENT_RENDER;
+            onError(SSRErrors.RENDER_HTML, e);
           }
-          helmetData = ReactHelmet.renderStatic();
           return [
             4,
             Promise.all(collectors.map(function(component) {
               return component.effect();
             }))
           ];
-        case 2:
+        case 1:
           _state.sent();
-          cost = end();
-          onTiming(SSRTimings.RENDER_HTML, cost);
-          return [
-            3,
-            4
-          ];
-        case 3:
-          e = _state.sent();
-          chunkSet.renderLevel = RenderLevel.CLIENT_RENDER;
-          onError(SSRErrors.RENDER_HTML, e);
-          return [
-            3,
-            4
-          ];
-        case 4:
           ssrScripts = chunkSet.ssrScripts, cssChunk = chunkSet.cssChunk, jsChunk = chunkSet.jsChunk;
           return [
             4,
@@ -179,7 +163,7 @@ function _generateHtml() {
               createReplaceHelemt(helmetData)
             ].concat(_to_consumable_array(htmlModifiers)))
           ];
-        case 5:
+        case 2:
           finalHtml = _state.sent();
           return [
             2,

package/dist/esm/core/server/string/ssrData.js

@@ -5,6 +5,7 @@ import { _ as _class_private_field_set } from "@swc/helpers/_/_class_private_fie
 import { _ as _class_private_method_get } from "@swc/helpers/_/_class_private_method_get";
 import { _ as _class_private_method_init } from "@swc/helpers/_/_class_private_method_init";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
+import { _ as _type_of } from "@swc/helpers/_/_type_of";
 import { serializeJson } from "@modern-js/runtime-utils/node";
 import { ROUTER_DATA_JSON_ID, SSR_DATA_JSON_ID } from "../../constants";
 import { attributesToString, serializeErrors } from "../utils";
@@ -37,7 +38,7 @@ var SSRDataCollector = /* @__PURE__ */ function() {
 function getSSRData() {
   var _$_class_private_field_get = _class_private_field_get(this, _options), prefetchData = _$_class_private_field_get.prefetchData, chunkSet = _$_class_private_field_get.chunkSet, ssrConfig = _$_class_private_field_get.ssrConfig, ssrContext = _$_class_private_field_get.ssrContext;
   var reporter = ssrContext.reporter, request = ssrContext.request;
-  var headers = typeof ssrConfig === "object" && ssrConfig.unsafeHeaders ? Object.fromEntries(Object.entries(request.headers).filter(function(param) {
+  var headers = (typeof ssrConfig === "undefined" ? "undefined" : _type_of(ssrConfig)) === "object" && ssrConfig.unsafeHeaders ? Object.fromEntries(Object.entries(request.headers).filter(function(param) {
     var _param = _sliced_to_array(param, 2), key = _param[0], _ = _param[1];
     var _ssrConfig_unsafeHeaders_map, _ssrConfig_unsafeHeaders;
     return (_ssrConfig_unsafeHeaders = ssrConfig.unsafeHeaders) === null || _ssrConfig_unsafeHeaders === void 0 ? void 0 : (_ssrConfig_unsafeHeaders_map = _ssrConfig_unsafeHeaders.map(function(header) {

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

@@ -1,8 +1,8 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+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/universal/route";
+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";
@@ -18,7 +18,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:
@@ -27,12 +27,12 @@ var generateCode = function() {
               if (!isAutoMount)
                 return [
                   3,
-                  16
+                  14
                 ];
               if (!(pageRoutesEntry || nestedRoutesEntry))
                 return [
                   3,
-                  16
+                  14
                 ];
               initialRoutes = [];
               nestedRoutes = null;
@@ -104,7 +104,7 @@ var generateCode = function() {
               ssr = getEntryOptions(entryName, isMainEntry, _$config.server.ssr, _$config.server.ssrByEntries, packageName);
               useSSG = isSSGEntry(_$config, entryName, entrypoints);
               if (ssr) {
-                mode = typeof ssr === "object" ? ssr.mode || "string" : "string";
+                mode = (typeof ssr === "undefined" ? "undefined" : _type_of(ssr)) === "object" ? ssr.mode || "string" : "string";
               }
               if (mode === "stream") {
                 hasPageRoute = routes.some(function(route2) {
@@ -143,7 +143,7 @@ var generateCode = function() {
               if (!(entrypoint.nestedRoutesEntry && isUseSSRBundle(_$config)))
                 return [
                   3,
-                  12
+                  10
                 ];
               routesServerFile = getServerLoadersFile(internalDirectory, entryName);
               filtedRoutesForServer = filterRoutesForServer(routes);
@@ -183,51 +183,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
               ];
@@ -243,7 +223,7 @@ var generateCode = function() {
           hookRunners = api.useHookRunners();
           isV5 = isRouterV5(config);
           getRoutes = isV5 ? getClientRoutesLegacy : getClientRoutes;
-          oldVersion = typeof (config === null || config === void 0 ? void 0 : config.runtime.router) === "object" ? Boolean((config === null || config === void 0 ? void 0 : config.runtime.router).oldVersion) : false;
+          oldVersion = _type_of(config === null || config === void 0 ? void 0 : config.runtime.router) === "object" ? Boolean((config === null || config === void 0 ? void 0 : config.runtime.router).oldVersion) : false;
           return [
             4,
             Promise.all(entrypoints.map(generateEntryCode))
@@ -260,6 +240,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/router/cli/index.js

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

package/dist/esm/router/runtime/plugin.js

@@ -1,7 +1,7 @@
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
-import { jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { merge } from "@modern-js/runtime-utils/merge";
 import { parsedJSONFromElement } from "@modern-js/runtime-utils/parsed";
 import { RouterProvider, createBrowserRouter, createHashRouter, createRoutesFromElements, useHref, useLocation, useMatches } from "@modern-js/runtime-utils/router";
@@ -118,12 +118,26 @@ var routerPlugin = function() {
                 getBlockNavState
               ]);
             };
+            var Null = function() {
+              return null;
+            };
             return function(props) {
               beforeCreateRouter = false;
               var router = useCreateRouter(props);
-              return /* @__PURE__ */ _jsx(RouterProvider, {
-                router
-              });
+              return (
+                // To match the node tree about https://github.com/web-infra-dev/modern.js/blob/v2.59.0/packages/runtime/plugin-runtime/src/router/runtime/plugin.node.tsx#L150-L168
+                // According to react [useId generation algorithm](https://github.com/facebook/react/pull/22644), `useId` will generate id with the react node react struct.
+                // To void hydration failed, we must guarantee that the node tree when browser hydrate must have same struct with node tree when ssr render.
+                /* @__PURE__ */ _jsxs(_Fragment, {
+                  children: [
+                    /* @__PURE__ */ _jsx(RouterProvider, {
+                      router
+                    }),
+                    /* @__PURE__ */ _jsx(Null, {}),
+                    /* @__PURE__ */ _jsx(Null, {})
+                  ]
+                })
+              );
             };
           };
           return getRouteApp();

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

@@ -23,7 +23,7 @@ const ssrBuilderPlugin = (modernAPI) => ({
   name: "@modern-js/builder-plugin-ssr",
   setup(api) {
     api.modifyEnvironmentConfig((config, { name, mergeEnvironmentConfig }) => {
-      const isServerEnvironment = config.output.target === "node" || name === "serviceWorker";
+      const isServerEnvironment = config.output.target === "node" || name === "workerSSR";
       const userConfig = modernAPI.useResolvedConfigContext();
       const useLoadablePlugin = isUseSSRBundle(userConfig) && !isServerEnvironment && checkUseStringSSR(userConfig);
       return mergeEnvironmentConfig(config, {

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/core/server/string/index.js

@@ -69,26 +69,26 @@ const renderString = async (request, serverRoot, options) => {
   });
 };
 async function generateHtml(App, htmlTemplate, chunkSet, collectors, htmlModifiers, { onError, onTiming }) {
-  const end = time();
   let html = "";
   let helmetData;
+  const finalApp = collectors.reduce((pre, creator) => {
+    var _creator_collect;
+    return ((_creator_collect = creator.collect) === null || _creator_collect === void 0 ? void 0 : _creator_collect.call(creator, pre)) || pre;
+  }, App);
   try {
-    const finalApp = collectors.reduce((pre, creator) => {
-      var _creator_collect;
-      return ((_creator_collect = creator.collect) === null || _creator_collect === void 0 ? void 0 : _creator_collect.call(creator, pre)) || pre;
-    }, App);
+    const end = time();
     if (chunkSet.renderLevel >= RenderLevel.SERVER_PREFETCH) {
       html = ReactDomServer.renderToString(finalApp);
       chunkSet.renderLevel = RenderLevel.SERVER_RENDER;
     }
     helmetData = ReactHelmet.renderStatic();
-    await Promise.all(collectors.map((component) => component.effect()));
     const cost = end();
     onTiming(SSRTimings.RENDER_HTML, cost);
   } catch (e) {
     chunkSet.renderLevel = RenderLevel.CLIENT_RENDER;
     onError(SSRErrors.RENDER_HTML, e);
   }
+  await Promise.all(collectors.map((component) => component.effect()));
   const { ssrScripts, cssChunk, jsChunk } = chunkSet;
   const finalHtml = await buildHtml(htmlTemplate, [
     createReplaceHtml(html),

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

@@ -1,6 +1,5 @@
 import path from "path";
-import { fs, getEntryOptions, isRouterV5, isSSGEntry, isUseSSRBundle, logger } from "@modern-js/utils";
-import { filterRoutesForServer, filterRoutesLoader, markRoutes } from "@modern-js/utils/universal/route";
+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";
@@ -82,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);
@@ -101,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) {
@@ -122,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/esm-node/router/cli/index.js

@@ -1,6 +1,5 @@
 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 { fs, NESTED_ROUTE_SPEC_FILE, createRuntimeExportsUtils, filterRoutesForServer, getEntryOptions, isRouterV5 as isV5 } from "@modern-js/utils";
 import { isRouteEntry } from "./entry";
 import { handleFileChange, handleGeneratorEntryCode, handleModifyEntrypoints } from "./handler";
 import { isRouteEntry as isRouteEntry2 } from "./entry";

package/dist/esm-node/router/runtime/plugin.js

@@ -1,4 +1,4 @@
-import { jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { merge } from "@modern-js/runtime-utils/merge";
 import { parsedJSONFromElement } from "@modern-js/runtime-utils/parsed";
 import { RouterProvider, createBrowserRouter, createHashRouter, createRoutesFromElements, useHref, useLocation, useMatches } from "@modern-js/runtime-utils/router";
@@ -109,12 +109,24 @@ const routerPlugin = (userConfig = {}) => {
                 getBlockNavState
               ]);
             };
+            const Null = () => null;
             return (props) => {
               beforeCreateRouter = false;
               const router = useCreateRouter(props);
-              return /* @__PURE__ */ _jsx(RouterProvider, {
-                router
-              });
+              return (
+                // To match the node tree about https://github.com/web-infra-dev/modern.js/blob/v2.59.0/packages/runtime/plugin-runtime/src/router/runtime/plugin.node.tsx#L150-L168
+                // According to react [useId generation algorithm](https://github.com/facebook/react/pull/22644), `useId` will generate id with the react node react struct.
+                // To void hydration failed, we must guarantee that the node tree when browser hydrate must have same struct with node tree when ssr render.
+                /* @__PURE__ */ _jsxs(_Fragment, {
+                  children: [
+                    /* @__PURE__ */ _jsx(RouterProvider, {
+                      router
+                    }),
+                    /* @__PURE__ */ _jsx(Null, {}),
+                    /* @__PURE__ */ _jsx(Null, {})
+                  ]
+                })
+              );
             };
           };
           return getRouteApp();

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.2",
+  "version": "2.60.0",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -186,7 +186,7 @@
     "@modern-js-reduck/plugin-immutable": "^1.1.10",
     "@modern-js-reduck/react": "^1.1.10",
     "@modern-js-reduck/store": "^1.1.10",
-    "@swc/helpers": "0.5.3",
+    "@swc/helpers": "0.5.13",
     "@types/loadable__component": "^5.13.4",
     "@types/react-helmet": "^6.1.2",
     "@types/styled-components": "^5.1.14",
@@ -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/types": "2.58.3",
-    "@modern-js/runtime-utils": "2.58.3",
-    "@modern-js/plugin-data-loader": "2.58.3",
-    "@modern-js/utils": "2.58.4-alpha.2"
+    "@modern-js/plugin": "2.60.0",
+    "@modern-js/runtime-utils": "2.60.0",
+    "@modern-js/types": "2.60.0",
+    "@modern-js/utils": "2.60.0",
+    "@modern-js/plugin-data-loader": "2.60.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.2",
     "@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/app-tools": "2.58.3",
-    "@modern-js/core": "2.58.3",
-    "@scripts/jest-config": "2.58.3",
-    "@scripts/build": "2.58.3"
+    "webpack": "^5.94.0",
+    "@modern-js/core": "2.60.0",
+    "@modern-js/app-tools": "2.60.0",
+    "@scripts/build": "2.60.0",
+    "@scripts/jest-config": "2.60.0"
   },
   "sideEffects": false,
   "publishConfig": {