@modern-js/runtime 2.0.0-beta.2 → 2.0.0-beta.4

package/dist/js/modern/index.js

@@ -1,2 +1,22 @@
-export { isBrowser } from "./common";
-export { createApp, createPlugin, useLoader, bootstrap, RuntimeReactContext, defineConfig, registerInit, useRuntimeContext } from "./core";
+import { isBrowser } from "./common";
+import {
+  createApp,
+  createPlugin,
+  useLoader,
+  bootstrap,
+  RuntimeReactContext,
+  defineConfig,
+  registerInit,
+  useRuntimeContext
+} from "./core";
+export {
+  RuntimeReactContext,
+  bootstrap,
+  createApp,
+  createPlugin,
+  defineConfig,
+  isBrowser,
+  registerInit,
+  useLoader,
+  useRuntimeContext
+};

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

@@ -1,89 +1,102 @@
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-import { getEntryOptions, createRuntimeExportsUtils, PLUGIN_SCHEMAS } from '@modern-js/utils';
-const PLUGIN_IDENTIFIER = 'router';
-const ROUTES_IDENTIFIER = 'routes';
-export default (() => ({
-  name: '@modern-js/plugin-router',
-  required: ['@modern-js/runtime'],
-  setup: api => {
-    const runtimeConfigMap = new Map();
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+import {
+  getEntryOptions,
+  createRuntimeExportsUtils,
+  PLUGIN_SCHEMAS
+} from "@modern-js/utils";
+const PLUGIN_IDENTIFIER = "router";
+const ROUTES_IDENTIFIER = "routes";
+var cli_default = () => ({
+  name: "@modern-js/plugin-router",
+  required: ["@modern-js/runtime"],
+  setup: (api) => {
+    const runtimeConfigMap = /* @__PURE__ */ new Map();
     let pluginsExportsUtils;
     return {
       config() {
         const appContext = api.useAppContext();
-        pluginsExportsUtils = createRuntimeExportsUtils(appContext.internalDirectory, 'plugins');
+        pluginsExportsUtils = createRuntimeExportsUtils(
+          appContext.internalDirectory,
+          "plugins"
+        );
         return {
           source: {
             alias: {
-              '@modern-js/runtime/plugins': pluginsExportsUtils.getPath()
+              "@modern-js/runtime/plugins": pluginsExportsUtils.getPath()
             }
           }
         };
       },
       validateSchema() {
-        return PLUGIN_SCHEMAS['@modern-js/plugin-router'];
+        return PLUGIN_SCHEMAS["@modern-js/plugin-router"];
       },
-      modifyEntryImports({
-        entrypoint,
-        imports
-      }) {
-        var _userConfig$runtime, _userConfig$runtime$r;
-        const {
-          entryName,
-          fileSystemRoutes
-        } = entrypoint;
+      modifyEntryImports({ entrypoint, imports }) {
+        var _a, _b;
+        const { entryName, fileSystemRoutes } = entrypoint;
         const userConfig = api.useResolvedConfigContext();
-        const isLegacy = Boolean(userConfig === null || userConfig === void 0 ? void 0 : (_userConfig$runtime = userConfig.runtime) === null || _userConfig$runtime === void 0 ? void 0 : (_userConfig$runtime$r = _userConfig$runtime.router) === null || _userConfig$runtime$r === void 0 ? void 0 : _userConfig$runtime$r.legacy);
-        const {
+        const isLegacy = Boolean((_b = (_a = userConfig == null ? void 0 : userConfig.runtime) == null ? void 0 : _a.router) == null ? void 0 : _b.legacy);
+        const { packageName } = api.useAppContext();
+        const runtimeConfig = getEntryOptions(
+          entryName,
+          userConfig.runtime,
+          userConfig.runtimeByEntries,
           packageName
-        } = api.useAppContext();
-        const runtimeConfig = getEntryOptions(entryName, userConfig.runtime, userConfig.runtimeByEntries, packageName);
+        );
         runtimeConfigMap.set(entryName, runtimeConfig);
-        if (runtimeConfig !== null && runtimeConfig !== void 0 && runtimeConfig.router) {
+        if (runtimeConfig == null ? void 0 : runtimeConfig.router) {
           if (!isLegacy) {
             imports.push({
-              value: '@modern-js/runtime/plugins',
-              specifiers: [{
-                imported: PLUGIN_IDENTIFIER
-              }]
+              value: "@modern-js/runtime/plugins",
+              specifiers: [{ imported: PLUGIN_IDENTIFIER }]
             });
           }
         } else if (fileSystemRoutes) {
-          throw new Error(`should enable runtime.router for entry ${entryName}`);
+          throw new Error(
+            `should enable runtime.router for entry ${entryName}`
+          );
         }
         return {
           entrypoint,
           imports
         };
       },
-      modifyEntryRuntimePlugins({
-        entrypoint,
-        plugins
-      }) {
-        var _userConfig$runtime2, _userConfig$runtime2$;
-        const {
-          entryName,
-          fileSystemRoutes
-        } = entrypoint;
-        const {
-          serverRoutes
-        } = api.useAppContext();
+      modifyEntryRuntimePlugins({ entrypoint, plugins }) {
+        var _a, _b;
+        const { entryName, fileSystemRoutes } = entrypoint;
+        const { serverRoutes } = api.useAppContext();
         const userConfig = api.useResolvedConfigContext();
-        const isLegacy = Boolean(userConfig === null || userConfig === void 0 ? void 0 : (_userConfig$runtime2 = userConfig.runtime) === null || _userConfig$runtime2 === void 0 ? void 0 : (_userConfig$runtime2$ = _userConfig$runtime2.router) === null || _userConfig$runtime2$ === void 0 ? void 0 : _userConfig$runtime2$.legacy);
+        const isLegacy = Boolean((_b = (_a = userConfig == null ? void 0 : userConfig.runtime) == null ? void 0 : _a.router) == null ? void 0 : _b.legacy);
         const runtimeConfig = runtimeConfigMap.get(entryName);
         if (runtimeConfig.router && !isLegacy) {
-          // Todo: plugin-router best to only handle manage client route.
-          // here support base server route usage, part for compatibility
-          const serverBase = serverRoutes.filter(route => route.entryName === entryName).map(route => route.urlPath).sort((a, b) => a.length - b.length > 0 ? -1 : 1);
+          const serverBase = serverRoutes.filter((route) => route.entryName === entryName).map((route) => route.urlPath).sort((a, b) => a.length - b.length > 0 ? -1 : 1);
           plugins.push({
             name: PLUGIN_IDENTIFIER,
-            options: JSON.stringify(_objectSpread(_objectSpread({
+            options: JSON.stringify(__spreadProps(__spreadValues({
               serverBase
-            }, runtimeConfig.router), {}, {
-              routesConfig: fileSystemRoutes ? `{ ${ROUTES_IDENTIFIER}, globalApp: App }` : undefined
-            })).replace(/"routesConfig"\s*:\s*"((\S|\s)+)"/g, '"routesConfig": $1,')
+            }, runtimeConfig.router), {
+              routesConfig: fileSystemRoutes ? `{ ${ROUTES_IDENTIFIER}, globalApp: App }` : void 0
+            })).replace(
+              /"routesConfig"\s*:\s*"((\S|\s)+)"/g,
+              '"routesConfig": $1,'
+            )
           });
         }
         return {
@@ -92,13 +105,18 @@ export default (() => ({
         };
       },
       addRuntimeExports() {
-        var _userConfig$runtime3, _userConfig$runtime3$;
+        var _a, _b;
         const userConfig = api.useResolvedConfigContext();
-        const isLegacy = Boolean(userConfig === null || userConfig === void 0 ? void 0 : (_userConfig$runtime3 = userConfig.runtime) === null || _userConfig$runtime3 === void 0 ? void 0 : (_userConfig$runtime3$ = _userConfig$runtime3.router) === null || _userConfig$runtime3$ === void 0 ? void 0 : _userConfig$runtime3$.legacy);
+        const isLegacy = Boolean((_b = (_a = userConfig == null ? void 0 : userConfig.runtime) == null ? void 0 : _a.router) == null ? void 0 : _b.legacy);
         if (!isLegacy) {
-          pluginsExportsUtils.addExport(`export { default as router } from '@modern-js/runtime/router'`);
+          pluginsExportsUtils.addExport(
+            `export { default as router } from '@modern-js/runtime/router'`
+          );
         }
       }
     };
   }
-}));
+});
+export {
+  cli_default as default
+};

package/dist/js/modern/router/index.js

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

package/dist/js/modern/router/runtime/DefaultNotFound.js

@@ -1,13 +1,14 @@
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-import React from 'react';
-import { jsx as _jsx } from "react/jsx-runtime";
-export const DefaultNotFound = () => /*#__PURE__*/_jsx("div", {
+import { jsx } from "react/jsx-runtime";
+const DefaultNotFound = () => /* @__PURE__ */ jsx("div", {
   style: {
-    margin: '150px auto',
-    textAlign: 'center',
-    display: 'flex',
-    alignItems: 'center',
-    justifyContent: 'center'
+    margin: "150px auto",
+    textAlign: "center",
+    display: "flex",
+    alignItems: "center",
+    justifyContent: "center"
   },
   children: "404"
-});
+});
+export {
+  DefaultNotFound
+};

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

@@ -1,4 +1,9 @@
 import { routerPlugin } from "./plugin";
-export default routerPlugin;
-export * from 'react-router-dom';
-export * from "./withRouter";
+var runtime_default = routerPlugin;
+import { modifyRoutes } from "./plugin";
+export * from "react-router-dom";
+export * from "./withRouter";
+export {
+  runtime_default as default,
+  modifyRoutes
+};

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

@@ -1,52 +1,80 @@
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-import React from 'react';
-import { createBrowserRouter, createHashRouter, RouterProvider, createRoutesFromElements } from 'react-router-dom';
-import hoistNonReactStatics from 'hoist-non-react-statics';
-import { renderRoutes } from "./utils";
-import { jsx as _jsx } from "react/jsx-runtime";
-export const routerPlugin = ({
-  serverBase: _serverBase = [],
-  supportHtml5History: _supportHtml5History = true,
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+import { jsx } from "react/jsx-runtime";
+import {
+  createBrowserRouter,
+  createHashRouter,
+  RouterProvider,
+  createRoutesFromElements
+} from "react-router-dom";
+import hoistNonReactStatics from "hoist-non-react-statics";
+import { renderRoutes, urlJoin } from "./utils";
+let finalRouteConfig = {
+  routes: []
+};
+let beforeCreateRouter = true;
+function modifyRoutes(modifyFunction) {
+  if (beforeCreateRouter) {
+    const { routes: originRoutes } = finalRouteConfig;
+    const newRoutes = modifyFunction(originRoutes);
+    finalRouteConfig.routes = newRoutes;
+  } else {
+    console.error(
+      "It is not allowed to modify routes config after create router."
+    );
+  }
+}
+const routerPlugin = ({
+  serverBase = [],
+  supportHtml5History = true,
+  basename = "",
   routesConfig,
   createRoutes
 }) => {
-  const select = pathname => _serverBase.find(baseUrl => pathname.search(baseUrl) === 0) || '/';
+  const select = (pathname) => serverBase.find((baseUrl) => pathname.search(baseUrl) === 0) || "/";
+  finalRouteConfig = routesConfig;
   return {
-    name: '@modern-js/plugin-router',
+    name: "@modern-js/plugin-router",
     setup: () => {
       return {
-        hoc: ({
-          App
-        }, next) => {
-          // can not get routes config, skip wrapping React Router.
-          // e.g. App.tsx as the entrypoint
-          if (!routesConfig) {
-            return next({
-              App
-            });
+        hoc: ({ App }, next) => {
+          if (!finalRouteConfig && !createRoutes) {
+            return next({ App });
           }
           const getRouteApp = () => {
-            return props => {
-              var _window$_SERVER_DATA;
-              const routeElements = renderRoutes(routesConfig);
-              const routes = createRoutes ? createRoutes() : createRoutesFromElements(routeElements);
-              const baseUrl = ((_window$_SERVER_DATA = window._SERVER_DATA) === null || _window$_SERVER_DATA === void 0 ? void 0 : _window$_SERVER_DATA.router.baseUrl) || select(location.pathname);
-              const router = _supportHtml5History ? createBrowserRouter(routes, {
-                basename: baseUrl
-              }) : createHashRouter(routes, {
-                basename: baseUrl
-              });
-              return /*#__PURE__*/_jsx(App, _objectSpread(_objectSpread({}, props), {}, {
-                children: /*#__PURE__*/_jsx(RouterProvider, {
-                  router: router
+            return (props) => {
+              var _a;
+              beforeCreateRouter = true;
+              const routes = createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes(finalRouteConfig));
+              const baseUrl = ((_a = window._SERVER_DATA) == null ? void 0 : _a.router.baseUrl) || select(location.pathname);
+              const _basename = baseUrl === "/" ? urlJoin(baseUrl, basename) : baseUrl;
+              const router = supportHtml5History ? createBrowserRouter(routes, { basename: _basename }) : createHashRouter(routes, { basename: _basename });
+              return /* @__PURE__ */ jsx(App, __spreadProps(__spreadValues({}, props), {
+                children: /* @__PURE__ */ jsx(RouterProvider, {
+                  router
                 })
               }));
             };
           };
           const RouteApp = getRouteApp();
-          if (routesConfig.globalApp) {
+          if (routesConfig == null ? void 0 : routesConfig.globalApp) {
             return next({
               App: hoistNonReactStatics(RouteApp, routesConfig.globalApp)
             });
@@ -58,4 +86,10 @@ export const routerPlugin = ({
       };
     }
   };
-};
+};
+export {
+  beforeCreateRouter,
+  finalRouteConfig,
+  modifyRoutes,
+  routerPlugin
+};

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

@@ -1,44 +1,67 @@
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-import React, { useContext } from 'react';
-import { unstable_createStaticHandler as createStaticHandler } from '@remix-run/router';
-import { unstable_createStaticRouter as createStaticRouter, unstable_StaticRouterProvider as StaticRouterProvider } from 'react-router-dom/server';
-import hoistNonReactStatics from 'hoist-non-react-statics';
-import { installGlobals } from '@remix-run/node';
-import { createRoutesFromElements } from 'react-router-dom';
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+import { jsx } from "react/jsx-runtime";
+import { useContext } from "react";
+import { unstable_createStaticHandler as createStaticHandler } from "@remix-run/router";
+import {
+  unstable_createStaticRouter as createStaticRouter,
+  unstable_StaticRouterProvider as StaticRouterProvider
+} from "react-router-dom/server";
+import hoistNonReactStatics from "hoist-non-react-statics";
+import { installGlobals } from "@remix-run/node";
+import { createRoutesFromElements } from "react-router-dom";
 import { RuntimeReactContext } from "../../core";
-import { renderRoutes } from "./utils";
-
-// Polyfill Web Fetch API
-import { jsx as _jsx } from "react/jsx-runtime";
+import { renderRoutes, urlJoin } from "./utils";
 installGlobals();
-
-// TODO: polish
 function createFetchRequest(req) {
-  // const origin = `${req.protocol}://${req.get('host')}`;
   const origin = `${req.protocol}://${req.host}`;
-  // Note: This had to take originalUrl into account for presumably vite's proxying
   const url = new URL(req.originalUrl || req.url, origin);
   const controller = new AbortController();
-
-  // req.on('close', () => {
-  //   controller.abort();
-  // });
-
   const init = {
     method: req.method,
     headers: createFetchHeaders(req.headers),
     signal: controller.signal
   };
-
-  // if (req.method !== 'GET' && req.method !== 'HEAD') {
-  //   init.body = req.body;
-  // }
-
   return new Request(url.href, init);
 }
-export function createFetchHeaders(requestHeaders) {
+function createFetchHeaders(requestHeaders) {
   const headers = new Headers();
   for (const [key, values] of Object.entries(requestHeaders)) {
     if (values) {
@@ -53,68 +76,50 @@ export function createFetchHeaders(requestHeaders) {
   }
   return headers;
 }
-export const routerPlugin = ({
+const routerPlugin = ({
+  basename = "",
   routesConfig,
   createRoutes
 }) => {
   return {
-    name: '@modern-js/plugin-router',
+    name: "@modern-js/plugin-router",
     setup: () => {
       return {
-        async init({
-          context
-        }, next) {
-          // can not get routes config, skip wrapping React Router.
-          // e.g. App.tsx as the entrypoint
-          if (!routesConfig) {
-            return next({
-              context
+        init(_0, _1) {
+          return __async(this, arguments, function* ({ context }, next) {
+            if (!routesConfig && !createRoutes) {
+              return next({ context });
+            }
+            const { request } = context.ssrContext;
+            const baseUrl = request.baseUrl;
+            const _basename = baseUrl === "/" ? urlJoin(baseUrl, basename) : baseUrl;
+            const routes = createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes(routesConfig));
+            const { query } = createStaticHandler(routes, {
+              basename: _basename
             });
-          }
-          const {
-            request
-          } = context.ssrContext;
-          const routeElements = renderRoutes(routesConfig);
-          const routes = createRoutes ? createRoutes() : createRoutesFromElements(routeElements);
-          const {
-            query
-          } = createStaticHandler(routes);
-          const remixRequest = createFetchRequest(request);
-          const routerContext = await query(remixRequest);
-          if (routerContext instanceof Response) {
-            // React Router would return a Response when redirects occur in loader.
-            // Throw the Response to bail out and let the server handle it with an HTTP redirect
-            return routerContext;
-          }
-          const router = createStaticRouter(routes, routerContext);
-          context.router = router;
-          context.routerContext = routerContext;
-          context.routes = routes;
-          // set routeManifest in context to be consistent with csr context
-          context.routeManifest = context.ssrContext.routeManifest;
-          return next({
-            context
+            const remixRequest = createFetchRequest(request);
+            const routerContext = yield query(remixRequest);
+            if (routerContext instanceof Response) {
+              return routerContext;
+            }
+            const router = createStaticRouter(routes, routerContext);
+            context.router = router;
+            context.routerContext = routerContext;
+            context.routes = routes;
+            context.routeManifest = context.ssrContext.routeManifest;
+            return next({ context });
           });
         },
-        hoc: ({
-          App
-        }, next) => {
-          // can not get routes config, skip wrapping React Router.
-          // e.g. App.tsx as the entrypoint
+        hoc: ({ App }, next) => {
           if (!routesConfig) {
-            return next({
-              App
-            });
+            return next({ App });
           }
           const getRouteApp = () => {
-            return props => {
-              const {
-                router,
-                routerContext
-              } = useContext(RuntimeReactContext);
-              return /*#__PURE__*/_jsx(App, _objectSpread(_objectSpread({}, props), {}, {
-                children: /*#__PURE__*/_jsx(StaticRouterProvider, {
-                  router: router,
+            return (props) => {
+              const { router, routerContext } = useContext(RuntimeReactContext);
+              return /* @__PURE__ */ jsx(App, __spreadProps(__spreadValues({}, props), {
+                children: /* @__PURE__ */ jsx(StaticRouterProvider, {
+                  router,
                   context: routerContext,
                   nonce: "the-nonce"
                 })
@@ -122,7 +127,7 @@ export const routerPlugin = ({
             };
           };
           const RouteApp = getRouteApp();
-          if (routesConfig.globalApp) {
+          if (routesConfig == null ? void 0 : routesConfig.globalApp) {
             return next({
               App: hoistNonReactStatics(RouteApp, routesConfig.globalApp)
             });
@@ -134,4 +139,8 @@ export const routerPlugin = ({
       };
     }
   };
-};
+};
+export {
+  createFetchHeaders,
+  routerPlugin
+};

package/dist/js/modern/router/runtime/root/index.js

@@ -1,19 +1,19 @@
-import React, { useContext, useEffect } from 'react';
-import { useLocation } from 'react-router-dom';
+import { Fragment, jsx } from "react/jsx-runtime";
+import { useContext, useEffect } from "react";
+import { useLocation } from "react-router-dom";
 import { RuntimeReactContext } from "../../../core";
 import { handleLoad } from "./load";
-import { Fragment as _Fragment } from "react/jsx-runtime";
-import { jsx as _jsx } from "react/jsx-runtime";
-export function RootLayout(props) {
+function RootLayout(props) {
   const location = useLocation();
   const context = useContext(RuntimeReactContext);
   useEffect(() => {
-    const {
-      routes
-    } = props;
+    const { routes } = props;
     handleLoad(routes, location, context.routeManifest);
   }, [location]);
-  return /*#__PURE__*/_jsx(_Fragment, {
+  return /* @__PURE__ */ jsx(Fragment, {
     children: props.children
   });
-}
+}
+export {
+  RootLayout
+};