@modern-js/runtime 2.14.0 → 2.15.1-alpha.0

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

@@ -1,9 +1,14 @@
+import { useRouteLoaderData as useRouteData } from "react-router-dom";
 import { routerPlugin } from "./plugin";
-var runtime_default = routerPlugin;
-import { modifyRoutes } from "./plugin";
+export default routerPlugin;
+export { modifyRoutes } from "./plugin";
 export * from "./withRouter";
-import { Link, NavLink } from "./PrefetchLink";
-import {
+export { Link, NavLink } from "./PrefetchLink";
+export const useRouteLoaderData = (routeId) => {
+  const realRouteId = routeId.replace(/\((.*?)\)/g, "[$1]");
+  return useRouteData(realRouteId);
+};
+export {
   createBrowserRouter,
   createHashRouter,
   createMemoryRouter,
@@ -42,7 +47,6 @@ import {
   useResolvedPath,
   useRevalidator,
   useRouteError,
-  useRouteLoaderData,
   useRoutes,
   useSearchParams,
   useSubmit,
@@ -55,67 +59,8 @@ import {
   matchRoutes,
   renderMatches,
   resolvePath,
-  createPath
-} from "react-router-dom";
-import { defer, json, redirect } from "@modern-js/utils/universal/remix-router";
-export {
-  Await,
-  BrowserRouter,
-  Form,
-  HashRouter,
-  Link,
-  MemoryRouter,
-  NavLink,
-  Navigate,
-  Outlet,
-  Route,
-  Router,
-  RouterProvider,
-  Routes,
-  ScrollRestoration,
-  createBrowserRouter,
-  createHashRouter,
-  createMemoryRouter,
   createPath,
-  createRoutesFromChildren,
-  createRoutesFromElements,
-  createSearchParams,
-  runtime_default as default,
-  defer,
-  generatePath,
-  isRouteErrorResponse,
-  json,
-  matchPath,
-  matchRoutes,
-  modifyRoutes,
-  redirect,
-  renderMatches,
-  resolvePath,
-  useActionData,
-  useAsyncError,
-  useAsyncValue,
-  useBeforeUnload,
-  useFetcher,
-  useFetchers,
-  useFormAction,
-  useHref,
-  useInRouterContext,
-  useLinkClickHandler,
-  useLoaderData,
-  useLocation,
-  useMatch,
-  useMatches,
-  useNavigate,
-  useNavigation,
-  useNavigationType,
-  useOutlet,
-  useOutletContext,
-  useParams,
-  useResolvedPath,
-  useRevalidator,
-  useRouteError,
-  useRouteLoaderData,
-  useRoutes,
-  useSearchParams,
-  useSubmit
-};
+  unstable_useBlocker,
+  unstable_usePrompt
+} from "react-router-dom";
+export { defer, json, redirect } from "@modern-js/utils/universal/remix-router";

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

@@ -1,38 +1,23 @@
-import { jsx } from "react/jsx-runtime";
-import {
-  createBrowserRouter,
-  createHashRouter,
-  RouterProvider,
-  createRoutesFromElements,
-  useMatches,
-  useLocation
-} from "react-router-dom";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { createBrowserRouter, createHashRouter, RouterProvider, createRoutesFromElements, useMatches, useLocation } from "react-router-dom";
 import hoistNonReactStatics from "hoist-non-react-statics";
 import { parsedJSONFromElement } from "@modern-js/utils/runtime";
 import { modifyRoutes as modifyRoutesHook } from "./hooks";
 import { deserializeErrors, renderRoutes, urlJoin } from "./utils";
-let finalRouteConfig = {
+export let finalRouteConfig = {
   routes: []
 };
-let beforeCreateRouter = true;
-function modifyRoutes(modifyFunction) {
+export let beforeCreateRouter = true;
+export 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."
-    );
+    console.error("It is not allowed to modify routes config after create router.");
   }
 }
-const routerPlugin = ({
-  serverBase = [],
-  supportHtml5History = true,
-  basename = "",
-  routesConfig,
-  createRoutes
-}) => {
+export const routerPlugin = ({ serverBase = [], supportHtml5History = true, basename = "", routesConfig, createRoutes }) => {
   const select = (pathname) => serverBase.find((baseUrl) => pathname.search(baseUrl) === 0) || "/";
   let routes = [];
   finalRouteConfig = routesConfig;
@@ -54,28 +39,30 @@ const routerPlugin = ({
               return routes;
             }
           });
-          return next({ context });
+          return next({
+            context
+          });
         },
         hoc: ({ App }, next) => {
           if (!finalRouteConfig && !createRoutes) {
-            return next({ App });
+            return next({
+              App
+            });
           }
           const getRouteApp = () => {
             return (props) => {
-              var _a;
+              var _window__SERVER_DATA;
               beforeCreateRouter = false;
-              routes = createRoutes ? createRoutes() : createRoutesFromElements(
-                renderRoutes({
-                  routesConfig: finalRouteConfig,
-                  props
-                })
-              );
+              routes = createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes({
+                routesConfig: finalRouteConfig,
+                props
+              }));
               const runner = api.useHookRunners();
               routes = runner.modifyRoutes(routes);
-              const baseUrl = ((_a = window._SERVER_DATA) == null ? void 0 : _a.router.baseUrl) || select(location.pathname);
+              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 _basename = baseUrl === "/" ? urlJoin(baseUrl, basename) : baseUrl;
               let hydrationData = window._ROUTER_DATA;
-              if (hydrationData == null ? void 0 : hydrationData.errors) {
+              if (hydrationData === null || hydrationData === void 0 ? void 0 : hydrationData.errors) {
                 hydrationData = {
                   ...hydrationData,
                   errors: deserializeErrors(hydrationData.errors)
@@ -88,14 +75,19 @@ const routerPlugin = ({
                 basename: _basename,
                 hydrationData
               });
-              return /* @__PURE__ */ jsx(App, { ...props, children: /* @__PURE__ */ jsx(RouterProvider, { router }) });
+              return /* @__PURE__ */ _jsx(App, {
+                ...props,
+                children: /* @__PURE__ */ _jsx(RouterProvider, {
+                  router
+                })
+              });
             };
           };
           let RouteApp = getRouteApp();
           if (App) {
             RouteApp = hoistNonReactStatics(RouteApp, App);
           }
-          if (routesConfig == null ? void 0 : routesConfig.globalApp) {
+          if (routesConfig === null || routesConfig === void 0 ? void 0 : routesConfig.globalApp) {
             return next({
               App: hoistNonReactStatics(RouteApp, routesConfig.globalApp)
             });
@@ -108,9 +100,3 @@ const routerPlugin = ({
     }
   };
 };
-export {
-  beforeCreateRouter,
-  finalRouteConfig,
-  modifyRoutes,
-  routerPlugin
-};

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

@@ -1,10 +1,7 @@
-import { jsx } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 import { useContext } from "react";
 import { createStaticHandler } from "@modern-js/utils/universal/remix-router";
-import {
-  createStaticRouter,
-  StaticRouterProvider
-} from "react-router-dom/server";
+import { createStaticRouter, StaticRouterProvider } from "react-router-dom/server";
 import hoistNonReactStatics from "hoist-non-react-statics";
 import { createRoutesFromElements } from "react-router-dom";
 import { RuntimeReactContext } from "../../core";
@@ -23,7 +20,7 @@ function createFetchRequest(req) {
   };
   return new Request(url.href, init);
 }
-function createFetchHeaders(requestHeaders) {
+export function createFetchHeaders(requestHeaders) {
   const headers = new Headers();
   for (const [key, values] of Object.entries(requestHeaders || {})) {
     if (values) {
@@ -38,11 +35,7 @@ function createFetchHeaders(requestHeaders) {
   }
   return headers;
 }
-const routerPlugin = ({
-  basename = "",
-  routesConfig,
-  createRoutes
-}) => {
+export const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
   return {
     name: "@modern-js/plugin-router",
     registerHook: {
@@ -52,17 +45,17 @@ const routerPlugin = ({
       return {
         async init({ context }, next) {
           if (!routesConfig && !createRoutes) {
-            return next({ context });
+            return next({
+              context
+            });
           }
           const { request, mode: ssrMode } = context.ssrContext;
           const baseUrl = request.baseUrl;
           const _basename = baseUrl === "/" ? urlJoin(baseUrl, basename) : baseUrl;
-          const routes = createRoutes ? createRoutes() : createRoutesFromElements(
-            renderRoutes({
-              routesConfig,
-              ssrMode
-            })
-          );
+          const routes = createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes({
+            routesConfig,
+            ssrMode
+          }));
           const { query } = createStaticHandler(routes, {
             basename: _basename
           });
@@ -78,27 +71,31 @@ const routerPlugin = ({
           context.routeManifest = context.ssrContext.routeManifest;
           const runner = api.useHookRunners();
           runner.modifyRoutes(routes);
-          return next({ context });
+          return next({
+            context
+          });
         },
         hoc: ({ App }, next) => {
           if (!routesConfig) {
-            return next({ App });
+            return next({
+              App
+            });
           }
           const getRouteApp = () => {
             return (props) => {
               const { router, routerContext } = useContext(RuntimeReactContext);
-              return /* @__PURE__ */ jsx(App, { ...props, children: /* @__PURE__ */ jsx(
-                StaticRouterProvider,
-                {
+              return /* @__PURE__ */ _jsx(App, {
+                ...props,
+                children: /* @__PURE__ */ _jsx(StaticRouterProvider, {
                   router,
                   context: routerContext,
                   hydrate: false
-                }
-              ) });
+                })
+              });
             };
           };
           const RouteApp = getRouteApp();
-          if (routesConfig == null ? void 0 : routesConfig.globalApp) {
+          if (routesConfig === null || routesConfig === void 0 ? void 0 : routesConfig.globalApp) {
             return next({
               App: hoistNonReactStatics(RouteApp, routesConfig.globalApp)
             });
@@ -111,10 +108,5 @@ const routerPlugin = ({
     }
   };
 };
-const modifyRoutes = () => {
-};
-export {
-  createFetchHeaders,
-  modifyRoutes,
-  routerPlugin
+export const modifyRoutes = () => {
 };

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

@@ -0,0 +1 @@
+export {};

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

@@ -1,23 +1,21 @@
-import { jsx } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 import { Route } from "react-router-dom";
-import {
-  ErrorResponse,
-  isRouteErrorResponse
-} from "@modern-js/utils/universal/remix-router";
+import { ErrorResponse, isRouteErrorResponse } from "@modern-js/utils/universal/remix-router";
 import { renderNestedRoute } from "@modern-js/utils/universal/nestedRoutes";
 import { DefaultNotFound } from "./DefaultNotFound";
 import DeferredDataScripts from "./DeferredDataScripts";
-function getRouteComponents(routes, {
-  globalApp,
-  ssrMode,
-  props
-}) {
+export function getRouteComponents(routes, { globalApp, ssrMode, props }) {
   const Layout = ({ Component, ...props2 }) => {
     const GlobalLayout = globalApp;
     if (!GlobalLayout) {
-      return /* @__PURE__ */ jsx(Component, { ...props2 });
+      return /* @__PURE__ */ _jsx(Component, {
+        ...props2
+      });
     }
-    return /* @__PURE__ */ jsx(GlobalLayout, { Component, ...props2 });
+    return /* @__PURE__ */ _jsx(GlobalLayout, {
+      Component,
+      ...props2
+    });
   };
   const routeElements = [];
   for (const route of routes) {
@@ -28,25 +26,22 @@ function getRouteComponents(routes, {
       });
       routeElements.push(routeElement);
     } else {
-      const routeElement = /* @__PURE__ */ jsx(
-        Route,
-        {
-          path: route.path,
-          element: /* @__PURE__ */ jsx(Layout, { Component: route.component })
-        },
-        route.path
-      );
+      const routeElement = /* @__PURE__ */ _jsx(Route, {
+        path: route.path,
+        element: /* @__PURE__ */ _jsx(Layout, {
+          Component: route.component
+        })
+      }, route.path);
       routeElements.push(routeElement);
     }
   }
-  routeElements.push(/* @__PURE__ */ jsx(Route, { path: "*", element: /* @__PURE__ */ jsx(DefaultNotFound, {}) }, "*"));
+  routeElements.push(/* @__PURE__ */ _jsx(Route, {
+    path: "*",
+    element: /* @__PURE__ */ _jsx(DefaultNotFound, {})
+  }, "*"));
   return routeElements;
 }
-function renderRoutes({
-  routesConfig,
-  props,
-  ssrMode
-}) {
+export function renderRoutes({ routesConfig, props, ssrMode }) {
   if (!routesConfig) {
     return null;
   }
@@ -61,22 +56,22 @@ function renderRoutes({
   });
   return routeElements;
 }
-function getLocation(serverContext) {
-  var _a;
-  const { pathname, url } = (serverContext == null ? void 0 : serverContext.request) || {};
-  const cleanUrl = (_a = url == null ? void 0 : url.replace("http://", "")) == null ? void 0 : _a.replace("https://", "");
+export function getLocation(serverContext) {
+  var _url_replace;
+  const { pathname, url } = (serverContext === null || serverContext === void 0 ? void 0 : serverContext.request) || {};
+  const cleanUrl = (_url_replace = url === null || url === void 0 ? void 0 : url.replace("http://", "")) === null || _url_replace === void 0 ? void 0 : _url_replace.replace("https://", "");
   const index = (cleanUrl || "").indexOf(pathname);
   if (index === -1) {
     return pathname;
   }
   return cleanUrl.substring(index);
 }
-const urlJoin = (...parts) => {
+export const urlJoin = (...parts) => {
   const separator = "/";
   const replace = new RegExp(`${separator}{1,}`, "g");
   return standardSlash(parts.join(separator).replace(replace, separator));
 };
-function standardSlash(str) {
+export function standardSlash(str) {
   let addr = str;
   if (!addr || typeof addr !== "string") {
     return addr;
@@ -92,7 +87,7 @@ function standardSlash(str) {
   }
   return addr;
 }
-function serializeErrors(errors) {
+export function serializeErrors(errors) {
   if (!errors) {
     return null;
   }
@@ -100,7 +95,10 @@ function serializeErrors(errors) {
   const serialized = {};
   for (const [key, val] of entries) {
     if (isRouteErrorResponse(val)) {
-      serialized[key] = { ...val, __type: "RouteErrorResponse" };
+      serialized[key] = {
+        ...val,
+        __type: "RouteErrorResponse"
+      };
     } else if (val instanceof Error) {
       serialized[key] = {
         message: val.message,
@@ -113,7 +111,7 @@ function serializeErrors(errors) {
   }
   return serialized;
 }
-function deserializeErrors(errors) {
+export function deserializeErrors(errors) {
   if (!errors) {
     return null;
   }
@@ -121,12 +119,7 @@ function deserializeErrors(errors) {
   const serialized = {};
   for (const [key, val] of entries) {
     if (val && val.__type === "RouteErrorResponse") {
-      serialized[key] = new ErrorResponse(
-        val.status,
-        val.statusText,
-        val.data,
-        val.internal === true
-      );
+      serialized[key] = new ErrorResponse(val.status, val.statusText, val.data, val.internal === true);
     } else if (val && val.__type === "Error") {
       const error = new Error(val.message);
       error.stack = val.stack;
@@ -137,12 +130,3 @@ function deserializeErrors(errors) {
   }
   return serialized;
 }
-export {
-  deserializeErrors,
-  getLocation,
-  getRouteComponents,
-  renderRoutes,
-  serializeErrors,
-  standardSlash,
-  urlJoin
-};

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

@@ -1,21 +1,15 @@
-import { jsx } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 import { useLocation, useNavigate, useParams } from "react-router-dom";
-const withRouter = (Component) => {
+export const withRouter = (Component) => {
   return (props) => {
     const location = useLocation();
     const params = useParams();
     const navigate = useNavigate();
-    return /* @__PURE__ */ jsx(
-      Component,
-      {
-        ...props,
-        location,
-        params,
-        navigate
-      }
-    );
+    return /* @__PURE__ */ _jsx(Component, {
+      ...props,
+      location,
+      params,
+      navigate
+    });
   };
 };
-export {
-  withRouter
-};

package/dist/esm-node/runtimeContext.js

@@ -1,7 +1,3 @@
 import { createContext } from "react";
-const RuntimeReactContext = createContext({});
-const ServerRouterContext = createContext({});
-export {
-  RuntimeReactContext,
-  ServerRouterContext
-};
+export const RuntimeReactContext = createContext({});
+export const ServerRouterContext = createContext({});