@modern-js/runtime 2.67.11 → 2.68.1

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

@@ -37,7 +37,7 @@ var routerPlugin = function() {
         if ((nestedRoutesEntry || pageRoutesEntry) && !isRouterV5) {
           plugins.push({
             name: "router",
-            path: "@".concat(metaName2, "/runtime/router"),
+            path: "@".concat(metaName2, "/runtime/router/internal"),
             config: typeof routerConfig === "boolean" ? {
               serverBase
             } : _object_spread_props(_object_spread({}, routerConfig), {
@@ -64,9 +64,10 @@ var routerPlugin = function() {
               // react-router v6 is no longer support ie 11
               // so we need to compile these packages to ensure the compatibility
               // https://github.com/remix-run/react-router/commit/f6df0697e1b2064a2b3a12e8b39577326fdd945b
-              /node_modules\/react-router/,
-              /node_modules\/react-router-dom/,
-              /node_modules\/@remix-run\/router/
+              /[\\/]node_modules[\\/]react-router[\\/]/,
+              /[\\/]node_modules[\\/]react-router-dom[\\/]/,
+              /[\\/]node_modules[\\/]@remix-run[\\/]router[\\/]/,
+              path.resolve(__dirname, "../runtime").replace("cjs", "esm")
             ],
             globalVars: {
               "process.env._MODERN_ROUTER_VERSION": "v6"
@@ -127,7 +128,7 @@ var routerPlugin = function() {
         var _api_useAppContext = api.useAppContext(), internalDirectory = _api_useAppContext.internalDirectory, metaName2 = _api_useAppContext.metaName;
         var pluginsExportsUtils = createRuntimeExportsUtils(internalDirectory, "plugins");
         if (!isRouterV5) {
-          pluginsExportsUtils.addExport("export { default as router } from '@".concat(metaName2, "/runtime/router'"));
+          pluginsExportsUtils.addExport("export { default as router } from '@".concat(metaName2, "/runtime/router/internal'"));
         }
       });
       api.onFileChanged(function() {

package/dist/esm/router/index.js

@@ -1,7 +1 @@
-import { default as default2 } from "./runtime";
-import { default as default3 } from "./runtime";
 export * from "./runtime";
-export {
-  default3 as default,
-  default2 as router
-};

package/dist/esm/router/internal.js

@@ -0,0 +1,5 @@
+export * from "./runtime/internal";
+import { routerPlugin } from "./runtime/internal";
+export {
+  routerPlugin as default
+};

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

@@ -1,3 +1,4 @@
+"use client";
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
@@ -242,6 +243,5 @@ var NavLink = createPrefetchLink(RouterNavLink);
 NavLink.displayName = "NavLink";
 export {
   Link,
-  NavLink,
-  composeEventHandlers
+  NavLink
 };

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

@@ -2,9 +2,9 @@ import { ROUTER_DATA_JSON_ID } from "../../core/constants";
 var setupFnStr = "function s(r,e){_ROUTER_DATA.r=_ROUTER_DATA.r||{},_ROUTER_DATA.r[r]=_ROUTER_DATA.r[r]||{};return new Promise((function(A,R){_ROUTER_DATA.r[r][e]={resolve:A,reject:R}}))};";
 var resolveFnStr = "function r(e,r,o,A){A?_ROUTER_DATA.r[e][r].reject(A):_ROUTER_DATA.r[e][r].resolve(o)};";
 var preResolvedFnStr = "function p(e,r){return void 0!==r?Promise.reject(new Error(r.message)):Promise.resolve(e)};";
-var mergeLoaderDataStr = 'function mergeLoaderData(e,n){const r=n.reduce((function(e,{key:n,routerDataFnName:r,routerDataFnArgs:a}){const t=a.map((e=>{if("undefined"!==e&&null!==e)return JSON.parse(e)}));return console.info("args",t),{...e,[n]:_ROUTER_DATA[r](...t)}}),{});Object.assign(_ROUTER_DATA.loaderData[e],r)}';
+var mergeLoaderDataStr = 'function mergeLoaderData(e,n){var r=n.reduce((function(e,{key:n,routerDataFnName:r,routerDataFnArgs:a}){var t=a.map((e=>{if("undefined"!==e&&null!==e)return JSON.parse(e)}));return console.info("args",t),{...e,[n]:_ROUTER_DATA[r](...t)}}),{});Object.assign(_ROUTER_DATA.loaderData[e],r)}';
 var initRouterDataAttrs = "_ROUTER_DATA.s = ".concat(setupFnStr, "_ROUTER_DATA.r = ").concat(resolveFnStr, "_ROUTER_DATA.p = ").concat(preResolvedFnStr).concat(mergeLoaderDataStr);
-var modernInline = `function runWindowFn(){window[document.currentScript.getAttribute("data-fn-name")](...JSON.parse(document.currentScript.getAttribute("data-fn-args")))}function runRouterDataFn(){_ROUTER_DATA[document.currentScript.getAttribute("data-fn-name")](...JSON.parse(document.currentScript.getAttribute("data-fn-args")))}function initRouterData(e){var r=document.getElementById(e);if(r)try{_ROUTER_DATA=JSON.parse(r.textContent)}catch(r){console.error("parse ".concat(e," error"),t),_ROUTER_DATA={}}};initRouterData('`.concat(ROUTER_DATA_JSON_ID, "');").concat(initRouterDataAttrs);
+var modernInline = `function runWindowFn(){window[document.currentScript.getAttribute("data-fn-name")].apply(window,JSON.parse(document.currentScript.getAttribute("data-fn-args")))}function runRouterDataFn(){_ROUTER_DATA[document.currentScript.getAttribute("data-fn-name")].apply(_ROUTER_DATA,JSON.parse(document.currentScript.getAttribute("data-fn-args")))}function initRouterData(e){var r=document.getElementById(e);if(r)try{_ROUTER_DATA=JSON.parse(r.textContent)}catch(r){console.error("parse ".concat(e," error"),t),_ROUTER_DATA={}}};initRouterData('`.concat(ROUTER_DATA_JSON_ID, "');").concat(initRouterDataAttrs);
 var runRouterDataFnStr = "runRouterDataFn();";
 var runWindowFnStr = "runWindowFn();";
 export {

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

@@ -1,25 +1,17 @@
 import { useRouteLoaderData as useRouteData } from "@modern-js/runtime-utils/router";
-import { routerPlugin } from "./plugin";
 export * from "@modern-js/runtime-utils/router";
-import { renderRoutes } from "./utils";
-var runtime_default = routerPlugin;
-import { modifyRoutes } from "./plugin";
-export * from "./withRouter";
 import { Link, NavLink } from "./PrefetchLink";
 var useRouteLoaderData = function(routeId) {
   var realRouteId = routeId.replace(/\[(.*?)\]/g, "($1)");
   return useRouteData(realRouteId);
 };
 import { createShouldRevalidate, handleRouteModule, handleRouteModuleError } from "./routeModule";
+export * from "./withRouter";
 export {
   Link,
   NavLink,
   createShouldRevalidate,
-  runtime_default as default,
   handleRouteModule,
   handleRouteModuleError,
-  modifyRoutes,
-  renderRoutes,
-  routerPlugin,
   useRouteLoaderData
 };

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

@@ -0,0 +1,10 @@
+import { routerPlugin } from "./plugin";
+var internal_default = routerPlugin;
+import { renderRoutes } from "./utils";
+import { modifyRoutes } from "./plugin";
+export {
+  internal_default as default,
+  modifyRoutes,
+  renderRoutes,
+  routerPlugin
+};

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

@@ -5,11 +5,14 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import { merge } from "@modern-js/runtime-utils/merge";
 import { RouterProvider, createBrowserRouter, createHashRouter, createRoutesFromElements, useHref, useLocation, useMatches } from "@modern-js/runtime-utils/router";
 import { normalizePathname } from "@modern-js/runtime-utils/url";
-import { useContext, useMemo } from "react";
+import * as React from "react";
+import { useContext, useEffect, useMemo } from "react";
 import { RuntimeReactContext } from "../../core";
 import { getGlobalLayoutApp, getGlobalRoutes } from "../../core/context";
+import { getGlobalIsRscClient } from "../../core/context";
 import { modifyRoutes as modifyRoutesHook, onBeforeCreateRoutes as onBeforeCreateRoutesHook } from "./hooks";
-import { deserializeErrors, renderRoutes, urlJoin } from "./utils";
+import { createClientRouterFromPayload } from "./rsc-router";
+import { createRouteObjectsFromConfig, deserializeErrors, renderRoutes, urlJoin } from "./utils";
 var finalRouteConfig = {
   routes: []
 };
@@ -32,7 +35,9 @@ var routerPlugin = function() {
       onBeforeCreateRoutes: onBeforeCreateRoutesHook
     },
     setup: function(api) {
-      var routes = [];
+      var routesContainer = {
+        current: []
+      };
       api.onBeforeRender(function(context) {
         if (window._SSR_DATA && userConfig.unstable_reloadOnURLMismatch) {
           var _ssrContext_request;
@@ -52,19 +57,14 @@ var routerPlugin = function() {
         };
         Object.defineProperty(context, "routes", {
           get: function get() {
-            return routes;
+            return routesContainer.current;
           },
           enumerable: true
         });
       });
       api.wrapRoot(function(App) {
-        var pluginConfig = api.getRuntimeConfig();
-        var _merge = merge(pluginConfig.router || {}, userConfig), _merge_serverBase = _merge.serverBase, serverBase = _merge_serverBase === void 0 ? [] : _merge_serverBase, _merge_supportHtml5History = _merge.supportHtml5History, supportHtml5History = _merge_supportHtml5History === void 0 ? true : _merge_supportHtml5History, _merge_basename = _merge.basename, basename = _merge_basename === void 0 ? "" : _merge_basename, routesConfig = _merge.routesConfig, createRoutes = _merge.createRoutes, future = _merge.future;
-        var select = function(pathname) {
-          return serverBase.find(function(baseUrl) {
-            return pathname.search(baseUrl) === 0;
-          }) || "/";
-        };
+        var mergedConfig = merge(api.getRuntimeConfig().router || {}, userConfig);
+        var _mergedConfig_serverBase = mergedConfig.serverBase, serverBase = _mergedConfig_serverBase === void 0 ? [] : _mergedConfig_serverBase, _mergedConfig_supportHtml5History = mergedConfig.supportHtml5History, supportHtml5History = _mergedConfig_supportHtml5History === void 0 ? true : _mergedConfig_supportHtml5History, _mergedConfig_basename = mergedConfig.basename, basename = _mergedConfig_basename === void 0 ? "" : _mergedConfig_basename, routesConfig = mergedConfig.routesConfig, createRoutes = mergedConfig.createRoutes, future = mergedConfig.future;
         finalRouteConfig = _object_spread({
           routes: getGlobalRoutes(),
           globalApp: getGlobalLayoutApp()
@@ -72,86 +72,136 @@ var routerPlugin = function() {
         if (!finalRouteConfig.routes && !createRoutes) {
           return App;
         }
-        var getRouteApp = function() {
-          var useCreateRouter = function(props) {
-            var runtimeContext = useContext(RuntimeReactContext);
-            var baseUrl = select(location.pathname).replace(/^\/*/, "/");
-            var _basename = baseUrl === "/" ? urlJoin(baseUrl, runtimeContext._internalRouterBaseName || basename) : baseUrl;
-            var hydrationData = window._ROUTER_DATA;
-            var getBlockNavState = runtimeContext.unstable_getBlockNavState;
-            return useMemo(function() {
-              if (hydrationData === null || hydrationData === void 0 ? void 0 : hydrationData.errors) {
-                hydrationData = _object_spread_props(_object_spread({}, hydrationData), {
-                  errors: deserializeErrors(hydrationData.errors)
-                });
-              }
-              routes = createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes({
-                routesConfig: finalRouteConfig,
-                props
-              }));
-              var hooks = api.getHooks();
-              routes = hooks.modifyRoutes.call(routes);
-              var router = supportHtml5History ? createBrowserRouter(routes, {
-                basename: _basename,
-                hydrationData
-              }) : createHashRouter(routes, {
-                basename: _basename,
-                hydrationData
-              });
-              var originSubscribe = router.subscribe;
-              router.subscribe = function(listener) {
-                var wrapedListener = function() {
-                  for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-                    args[_key] = arguments[_key];
-                  }
-                  var blockRoute = getBlockNavState ? getBlockNavState() : false;
-                  if (blockRoute) {
-                    return;
-                  }
-                  return listener.apply(void 0, _to_consumable_array(args));
-                };
-                return originSubscribe(wrapedListener);
-              };
-              return router;
-            }, [
-              finalRouteConfig,
-              props,
-              _basename,
-              hydrationData,
-              getBlockNavState
-            ]);
-          };
-          var Null = function() {
-            return null;
-          };
-          return function(props) {
-            beforeCreateRouter = false;
-            var router = useCreateRouter(props);
-            var routerWrapper = (
-              // 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,
-                    future
-                  }),
-                  /* @__PURE__ */ _jsx(Null, {}),
-                  /* @__PURE__ */ _jsx(Null, {})
-                ]
-              })
-            );
-            return App ? /* @__PURE__ */ _jsx(App, {
-              children: routerWrapper
-            }) : routerWrapper;
+        var selectBasePath = function(pathname) {
+          return serverBase.find(function(baseUrl) {
+            return pathname.search(baseUrl) === 0;
+          }) || "/";
+        };
+        var RouterWrapper = function(props) {
+          var _useRouterCreation = useRouterCreation(_object_spread_props(_object_spread({}, props), {
+            rscPayload: props === null || props === void 0 ? void 0 : props.rscPayload
+          }), {
+            api,
+            createRoutes,
+            supportHtml5History,
+            selectBasePath,
+            basename,
+            future
+          }), router = _useRouterCreation.router, routes = _useRouterCreation.routes;
+          useEffect(function() {
+            routesContainer.current = routes;
+          }, [
+            routes
+          ]);
+          beforeCreateRouter = false;
+          var RouterContent = function() {
+            return /* @__PURE__ */ _jsxs(_Fragment, {
+              children: [
+                /* @__PURE__ */ _jsx(RouterProvider, {
+                  router,
+                  future
+                }),
+                /* @__PURE__ */ _jsx(EmptyComponent, {}),
+                /* @__PURE__ */ _jsx(EmptyComponent, {})
+              ]
+            });
           };
+          return App ? /* @__PURE__ */ _jsx(App, {
+            children: /* @__PURE__ */ _jsx(RouterContent, {})
+          }) : /* @__PURE__ */ _jsx(RouterContent, {});
         };
-        return getRouteApp();
+        return RouterWrapper;
       });
     }
   };
 };
+var EmptyComponent = function() {
+  return null;
+};
+var safeUse = function(promise) {
+  var useProp = "use";
+  var useHook = React && React[useProp];
+  if (typeof useHook === "function") {
+    return useHook(promise);
+  }
+  return null;
+};
+function useRouterCreation(props, options) {
+  var api = options.api, createRoutes = options.createRoutes, supportHtml5History = options.supportHtml5History, selectBasePath = options.selectBasePath, basename = options.basename;
+  var runtimeContext = useContext(RuntimeReactContext);
+  var baseUrl = selectBasePath(location.pathname).replace(/^\/*/, "/");
+  var _basename = baseUrl === "/" ? urlJoin(baseUrl, runtimeContext._internalRouterBaseName || basename) : baseUrl;
+  var getBlockNavState = runtimeContext.unstable_getBlockNavState;
+  var rscPayload = (props === null || props === void 0 ? void 0 : props.rscPayload) ? safeUse(props.rscPayload) : null;
+  var hydrationData = window._ROUTER_DATA || rscPayload;
+  return useMemo(function() {
+    if (hydrationData === null || hydrationData === void 0 ? void 0 : hydrationData.errors) {
+      hydrationData = _object_spread_props(_object_spread({}, hydrationData), {
+        errors: deserializeErrors(hydrationData.errors)
+      });
+    }
+    var isRscClient = getGlobalIsRscClient();
+    var routes = null;
+    if (isRscClient) {
+      routes = createRoutes ? createRoutes() : createRouteObjectsFromConfig({
+        routesConfig: finalRouteConfig
+      });
+    } else {
+      routes = createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes({
+        routesConfig: finalRouteConfig,
+        props
+      }));
+    }
+    if (!routes) {
+      routes = [];
+    }
+    var hooks = api.getHooks();
+    if (rscPayload) {
+      try {
+        var router = createClientRouterFromPayload(rscPayload, routes, _basename);
+        return {
+          router,
+          routes: router.routes || []
+        };
+      } catch (e) {
+        console.error("Failed to create router from RSC payload:", e);
+      }
+    }
+    var modifiedRoutes = hooks.modifyRoutes.call(routes);
+    console.log("modifiedRoutes111111", modifiedRoutes, _basename, hydrationData);
+    var router1 = supportHtml5History ? createBrowserRouter(modifiedRoutes, {
+      basename: _basename,
+      hydrationData
+    }) : createHashRouter(modifiedRoutes, {
+      basename: _basename,
+      hydrationData
+    });
+    var originSubscribe = router1.subscribe;
+    router1.subscribe = function(listener) {
+      var wrappedListener = function() {
+        for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+          args[_key] = arguments[_key];
+        }
+        var blockRoute = getBlockNavState ? getBlockNavState() : false;
+        if (blockRoute) {
+          return;
+        }
+        return listener.apply(void 0, _to_consumable_array(args));
+      };
+      return originSubscribe(wrappedListener);
+    };
+    return {
+      router: router1,
+      routes: modifiedRoutes
+    };
+  }, [
+    finalRouteConfig,
+    props,
+    _basename,
+    hydrationData,
+    getBlockNavState
+  ]);
+}
 export {
   beforeCreateRouter,
   finalRouteConfig,

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

@@ -13,10 +13,12 @@ import { LOADER_REPORTER_NAME } from "@modern-js/utils/universal/constants";
 import { useContext } from "react";
 import { JSX_SHELL_STREAM_END_MARK } from "../../common";
 import { RuntimeReactContext } from "../../core";
-import { getGlobalLayoutApp, getGlobalRoutes } from "../../core/context";
+import { getGlobalEnableRsc, getGlobalLayoutApp, getGlobalRoutes } from "../../core/context";
+import { setServerPayload } from "../../core/context/serverPayload.server";
 import DeferredDataScripts from "./DeferredDataScripts.node";
 import { modifyRoutes as modifyRoutesHook, onBeforeCreateRoutes as onBeforeCreateRoutesHook } from "./hooks";
-import { renderRoutes, urlJoin } from "./utils";
+import { RSCStaticRouter, createServerPayload, handleRSCRedirect, prepareRSCRoutes } from "./rsc-router";
+import { createRouteObjectsFromConfig, renderRoutes, urlJoin } from "./utils";
 function createRemixReuqest(request) {
   var method = "GET";
   var headers = request.headers;
@@ -39,7 +41,7 @@ var routerPlugin = function() {
       var finalRouteConfig = {};
       api.onBeforeRender(function() {
         var _ref = _async_to_generator(function(context, interrupt) {
-          var _context_ssrContext, _context_ssrContext_onTiming, _context_ssrContext1, pluginConfig, _merge, _merge_basename, basename, routesConfig, createRoutes, _context_ssrContext2, request, ssrMode, nonce, _context_ssrContext_loaderFailureMode, loaderFailureMode, baseUrl, _basename, reporter, requestContext, hooks, routes, query, remixRequest, end, routerContext, cost, errors, router;
+          var _context_ssrContext, _context_ssrContext_onTiming, _context_ssrContext1, pluginConfig, _merge, _merge_basename, basename, routesConfig, createRoutes, enableRsc, _context_ssrContext2, request, ssrMode, nonce, _context_ssrContext_loaderFailureMode, loaderFailureMode, baseUrl, _basename, reporter, requestContext, hooks, routes, query, remixRequest, end, routerContext, cost, isRSCNavigation, errors, payload, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, match;
           return _ts_generator(this, function(_state) {
             switch (_state.label) {
               case 0:
@@ -54,6 +56,20 @@ var routerPlugin = function() {
                     2
                   ];
                 }
+                enableRsc = getGlobalEnableRsc();
+                if (!enableRsc)
+                  return [
+                    3,
+                    2
+                  ];
+                return [
+                  4,
+                  prepareRSCRoutes(finalRouteConfig.routes)
+                ];
+              case 1:
+                _state.sent();
+                _state.label = 2;
+              case 2:
                 _context_ssrContext2 = context.ssrContext, request = _context_ssrContext2.request, ssrMode = _context_ssrContext2.mode, nonce = _context_ssrContext2.nonce, _context_ssrContext_loaderFailureMode = _context_ssrContext2.loaderFailureMode, loaderFailureMode = _context_ssrContext_loaderFailureMode === void 0 ? "errorBoundary" : _context_ssrContext_loaderFailureMode;
                 baseUrl = request.baseUrl;
                 _basename = baseUrl === "/" ? urlJoin(baseUrl, basename) : baseUrl;
@@ -65,15 +81,22 @@ var routerPlugin = function() {
                   4,
                   hooks.onBeforeCreateRoutes.call(context)
                 ];
-              case 1:
+              case 3:
                 _state.sent();
-                routes = createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes({
-                  routesConfig: finalRouteConfig,
-                  ssrMode,
-                  props: {
-                    nonce
-                  }
-                }));
+                routes = [];
+                if (enableRsc) {
+                  routes = createRoutes ? createRoutes() : createRouteObjectsFromConfig({
+                    routesConfig: finalRouteConfig
+                  });
+                } else {
+                  routes = createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes({
+                    routesConfig: finalRouteConfig,
+                    ssrMode,
+                    props: {
+                      nonce
+                    }
+                  }));
+                }
                 routes = hooks.modifyRoutes.call(routes);
                 query = createStaticHandler(routes, {
                   basename: _basename
@@ -86,15 +109,23 @@ var routerPlugin = function() {
                     requestContext
                   })
                 ];
-              case 2:
+              case 4:
                 routerContext = _state.sent();
                 cost = end();
                 (_context_ssrContext1 = context.ssrContext) === null || _context_ssrContext1 === void 0 ? void 0 : (_context_ssrContext_onTiming = _context_ssrContext1.onTiming) === null || _context_ssrContext_onTiming === void 0 ? void 0 : _context_ssrContext_onTiming.call(_context_ssrContext1, LOADER_REPORTER_NAME, cost);
+                isRSCNavigation = remixRequest.headers.get("x-rsc-tree") === "true";
                 if (_instanceof(routerContext, Response)) {
-                  return [
-                    2,
-                    interrupt(routerContext)
-                  ];
+                  if (enableRsc && isRSCNavigation) {
+                    return [
+                      2,
+                      interrupt(handleRSCRedirect(routerContext.headers, _basename, routerContext.status))
+                    ];
+                  } else {
+                    return [
+                      2,
+                      interrupt(routerContext)
+                    ];
+                  }
                 }
                 errors = Object.values(routerContext.errors || {});
                 if (
@@ -104,9 +135,35 @@ var routerPlugin = function() {
                   routerContext.statusCode = 200;
                   throw errors[0];
                 }
-                router = createStaticRouter(routes, routerContext);
                 context.routerContext = routerContext;
-                context.remixRouter = router;
+                if (enableRsc) {
+                  if (isRSCNavigation) {
+                    _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+                    try {
+                      for (_iterator = routerContext.matches[Symbol.iterator](); !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+                        match = _step.value;
+                        if (match.route.hasClientLoader) {
+                          delete routerContext.loaderData[match.route.id];
+                        }
+                      }
+                    } catch (err) {
+                      _didIteratorError = true;
+                      _iteratorError = err;
+                    } finally {
+                      try {
+                        if (!_iteratorNormalCompletion && _iterator.return != null) {
+                          _iterator.return();
+                        }
+                      } finally {
+                        if (_didIteratorError) {
+                          throw _iteratorError;
+                        }
+                      }
+                    }
+                  }
+                  payload = createServerPayload(routerContext, routes);
+                  setServerPayload(payload);
+                }
                 Object.defineProperty(context, "routes", {
                   get: function get() {
                     return routes;
@@ -128,30 +185,43 @@ var routerPlugin = function() {
           return App;
         }
         var getRouteApp = function() {
-          return function() {
+          var enableRsc = getGlobalEnableRsc();
+          return function(props) {
             var context = useContext(RuntimeReactContext);
-            var remixRouter = context.remixRouter, routerContext = context.routerContext, ssrContext = context.ssrContext;
+            var routerContext = context.routerContext, ssrContext = context.ssrContext, routes = context.routes;
             var nonce = ssrContext.nonce, mode = ssrContext.mode, useJsonScript = ssrContext.useJsonScript;
-            var routerWrapper = /* @__PURE__ */ _jsxs(_Fragment, {
-              children: [
-                /* @__PURE__ */ _jsx(StaticRouterProvider, {
-                  router: remixRouter,
-                  context: routerContext,
-                  hydrate: false
-                }),
-                mode === "stream" && // ROUTER_DATA will inject in `packages/runtime/plugin-runtime/src/core/server/string/ssrData.ts` in string ssr
-                // So we can inject it only when streaming ssr
-                /* @__PURE__ */ _jsx(DeferredDataScripts, {
-                  nonce,
-                  context: routerContext,
-                  useJsonScript
-                }),
-                mode === "stream" && JSX_SHELL_STREAM_END_MARK
-              ]
-            });
-            return App ? /* @__PURE__ */ _jsx(App, {
-              children: routerWrapper
-            }) : routerWrapper;
+            var basename = routerContext.basename;
+            var remixRouter = createStaticRouter(routes, routerContext);
+            if (!enableRsc) {
+              var routerWrapper = /* @__PURE__ */ _jsxs(_Fragment, {
+                children: [
+                  /* @__PURE__ */ _jsx(StaticRouterProvider, {
+                    router: remixRouter,
+                    context: routerContext,
+                    hydrate: false
+                  }),
+                  mode === "stream" && // ROUTER_DATA will inject in `packages/runtime/plugin-runtime/src/core/server/string/ssrData.ts` in string ssr
+                  // So we can inject it only when streaming ssr
+                  /* @__PURE__ */ _jsx(DeferredDataScripts, {
+                    nonce,
+                    context: routerContext,
+                    useJsonScript
+                  }),
+                  mode === "stream" && JSX_SHELL_STREAM_END_MARK
+                ]
+              });
+              return App ? /* @__PURE__ */ _jsx(App, {
+                children: routerWrapper
+              }) : routerWrapper;
+            } else {
+              return App ? /* @__PURE__ */ _jsx(App, {
+                children: /* @__PURE__ */ _jsx(RSCStaticRouter, {
+                  basename
+                })
+              }) : /* @__PURE__ */ _jsx(RSCStaticRouter, {
+                basename
+              });
+            }
           };
         };
         return getRouteApp();