@modern-js/runtime 2.15.1-alpha.2 → 2.16.1-alpha.0

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

@@ -1,2 +1,3 @@
-function installGlobals() {}
+function installGlobals() {
+}
 export { installGlobals };

package/dist/esm/router/runtime/fetch.worker.js

@@ -1,2 +1,3 @@
-function installGlobals() {}
+function installGlobals() {
+}
 export { installGlobals };

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

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

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

@@ -1,160 +1,159 @@
-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;
+function _define_property(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+  return obj;
 }
-function _objectSpread(target) {
-    for(var i = 1; i < arguments.length; i++){
-        var source = arguments[i] != null ? arguments[i] : {};
-        var ownKeys = Object.keys(source);
-        if (typeof Object.getOwnPropertySymbols === "function") {
-            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
-                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
-            }));
-        }
-        ownKeys.forEach(function(key) {
-            _defineProperty(target, key, source[key]);
-        });
+function _object_spread(target) {
+  for (var i = 1; i < arguments.length; i++) {
+    var source = arguments[i] != null ? arguments[i] : {};
+    var ownKeys2 = Object.keys(source);
+    if (typeof Object.getOwnPropertySymbols === "function") {
+      ownKeys2 = ownKeys2.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+        return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+      }));
     }
-    return target;
+    ownKeys2.forEach(function(key) {
+      _define_property(target, key, source[key]);
+    });
+  }
+  return target;
 }
 function ownKeys(object, enumerableOnly) {
-    var keys = Object.keys(object);
-    if (Object.getOwnPropertySymbols) {
-        var symbols = Object.getOwnPropertySymbols(object);
-        if (enumerableOnly) {
-            symbols = symbols.filter(function(sym) {
-                return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-            });
-        }
-        keys.push.apply(keys, symbols);
+  var keys = Object.keys(object);
+  if (Object.getOwnPropertySymbols) {
+    var symbols = Object.getOwnPropertySymbols(object);
+    if (enumerableOnly) {
+      symbols = symbols.filter(function(sym) {
+        return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+      });
     }
-    return keys;
+    keys.push.apply(keys, symbols);
+  }
+  return keys;
 }
-function _objectSpreadProps(target, source) {
-    source = source != null ? source : {};
-    if (Object.getOwnPropertyDescriptors) {
-        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
-    } else {
-        ownKeys(Object(source)).forEach(function(key) {
-            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-        });
-    }
-    return target;
+function _object_spread_props(target, source) {
+  source = source != null ? source : {};
+  if (Object.getOwnPropertyDescriptors) {
+    Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+  } else {
+    ownKeys(Object(source)).forEach(function(key) {
+      Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+    });
+  }
+  return target;
 }
-import { jsx } from "react/jsx-runtime";
+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";
-var finalRouteConfig = {
-    routes: []
+export var finalRouteConfig = {
+  routes: []
 };
-var beforeCreateRouter = true;
-function modifyRoutes(modifyFunction) {
-    if (beforeCreateRouter) {
-        var originRoutes = finalRouteConfig.routes;
-        var newRoutes = modifyFunction(originRoutes);
-        finalRouteConfig.routes = newRoutes;
-    } else {
-        console.error("It is not allowed to modify routes config after create router.");
-    }
+export var beforeCreateRouter = true;
+export function modifyRoutes(modifyFunction) {
+  if (beforeCreateRouter) {
+    var originRoutes = finalRouteConfig.routes;
+    var newRoutes = modifyFunction(originRoutes);
+    finalRouteConfig.routes = newRoutes;
+  } else {
+    console.error("It is not allowed to modify routes config after create router.");
+  }
 }
-var routerPlugin = function(param) {
-    var _param_serverBase = param.serverBase, serverBase = _param_serverBase === void 0 ? [] : _param_serverBase, _param_supportHtml5History = param.supportHtml5History, supportHtml5History = _param_supportHtml5History === void 0 ? true : _param_supportHtml5History, _param_basename = param.basename, basename = _param_basename === void 0 ? "" : _param_basename, routesConfig = param.routesConfig, createRoutes = param.createRoutes;
-    var select = function(pathname) {
-        return serverBase.find(function(baseUrl) {
-            return pathname.search(baseUrl) === 0;
-        }) || "/";
-    };
-    var routes = [];
-    finalRouteConfig = routesConfig;
-    window._SERVER_DATA = parsedJSONFromElement("__MODERN_SERVER_DATA__");
-    return {
-        name: "@modern-js/plugin-router",
-        registerHook: {
-            modifyRoutes: modifyRoutesHook
+export var routerPlugin = function(param) {
+  var _param_serverBase = param.serverBase, serverBase = _param_serverBase === void 0 ? [] : _param_serverBase, _param_supportHtml5History = param.supportHtml5History, supportHtml5History = _param_supportHtml5History === void 0 ? true : _param_supportHtml5History, _param_basename = param.basename, basename = _param_basename === void 0 ? "" : _param_basename, routesConfig = param.routesConfig, createRoutes = param.createRoutes;
+  var select = function(pathname) {
+    return serverBase.find(function(baseUrl) {
+      return pathname.search(baseUrl) === 0;
+    }) || "/";
+  };
+  var routes = [];
+  finalRouteConfig = routesConfig;
+  window._SERVER_DATA = parsedJSONFromElement("__MODERN_SERVER_DATA__");
+  return {
+    name: "@modern-js/plugin-router",
+    registerHook: {
+      modifyRoutes: modifyRoutesHook
+    },
+    setup: function(api) {
+      return {
+        init: function init(param2, next) {
+          var context = param2.context;
+          context.router = {
+            useMatches,
+            useLocation
+          };
+          Object.defineProperty(context, "routes", {
+            get: function get() {
+              return routes;
+            }
+          });
+          return next({
+            context
+          });
         },
-        setup: function(api) {
-            return {
-                init: function init(param, next) {
-                    var context = param.context;
-                    context.router = {
-                        useMatches: useMatches,
-                        useLocation: useLocation
-                    };
-                    Object.defineProperty(context, "routes", {
-                        get: function get() {
-                            return routes;
-                        }
-                    });
-                    return next({
-                        context: context
-                    });
-                },
-                hoc: function(param, next) {
-                    var App = param.App;
-                    if (!finalRouteConfig && !createRoutes) {
-                        return next({
-                            App: App
-                        });
-                    }
-                    var getRouteApp = function() {
-                        return function(props) {
-                            var _window__SERVER_DATA;
-                            beforeCreateRouter = false;
-                            routes = createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes({
-                                routesConfig: finalRouteConfig,
-                                props: props
-                            }));
-                            var runner = api.useHookRunners();
-                            routes = runner.modifyRoutes(routes);
-                            var baseUrl = ((_window__SERVER_DATA = window._SERVER_DATA) === null || _window__SERVER_DATA === void 0 ? void 0 : _window__SERVER_DATA.router.baseUrl) || select(location.pathname);
-                            var _basename = baseUrl === "/" ? urlJoin(baseUrl, basename) : baseUrl;
-                            var hydrationData = window._ROUTER_DATA;
-                            if (hydrationData === null || hydrationData === void 0 ? void 0 : hydrationData.errors) {
-                                hydrationData = _objectSpreadProps(_objectSpread({}, hydrationData), {
-                                    errors: deserializeErrors(hydrationData.errors)
-                                });
-                            }
-                            var router = supportHtml5History ? createBrowserRouter(routes, {
-                                basename: _basename,
-                                hydrationData: hydrationData
-                            }) : createHashRouter(routes, {
-                                basename: _basename,
-                                hydrationData: hydrationData
-                            });
-                            return /* @__PURE__ */ jsx(App, _objectSpreadProps(_objectSpread({}, props), {
-                                children: /* @__PURE__ */ jsx(RouterProvider, {
-                                    router: router
-                                })
-                            }));
-                        };
-                    };
-                    var RouteApp = getRouteApp();
-                    if (App) {
-                        RouteApp = hoistNonReactStatics(RouteApp, App);
-                    }
-                    if (routesConfig === null || routesConfig === void 0 ? void 0 : routesConfig.globalApp) {
-                        return next({
-                            App: hoistNonReactStatics(RouteApp, routesConfig.globalApp)
-                        });
-                    }
-                    return next({
-                        App: RouteApp
-                    });
-                }
+        hoc: function(param2, next) {
+          var App = param2.App;
+          if (!finalRouteConfig && !createRoutes) {
+            return next({
+              App
+            });
+          }
+          var getRouteApp = function() {
+            return function(props) {
+              var _window__SERVER_DATA;
+              beforeCreateRouter = false;
+              routes = createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes({
+                routesConfig: finalRouteConfig,
+                props
+              }));
+              var runner = api.useHookRunners();
+              routes = runner.modifyRoutes(routes);
+              var baseUrl = ((_window__SERVER_DATA = window._SERVER_DATA) === null || _window__SERVER_DATA === void 0 ? void 0 : _window__SERVER_DATA.router.baseUrl) || select(location.pathname);
+              var _basename = baseUrl === "/" ? urlJoin(baseUrl, basename) : baseUrl;
+              var hydrationData = window._ROUTER_DATA;
+              if (hydrationData === null || hydrationData === void 0 ? void 0 : hydrationData.errors) {
+                hydrationData = _object_spread_props(_object_spread({}, hydrationData), {
+                  errors: deserializeErrors(hydrationData.errors)
+                });
+              }
+              var router = supportHtml5History ? createBrowserRouter(routes, {
+                basename: _basename,
+                hydrationData
+              }) : createHashRouter(routes, {
+                basename: _basename,
+                hydrationData
+              });
+              return /* @__PURE__ */ _jsx(App, _object_spread_props(_object_spread({}, props), {
+                children: /* @__PURE__ */ _jsx(RouterProvider, {
+                  router
+                })
+              }));
             };
+          };
+          var RouteApp = getRouteApp();
+          if (App) {
+            RouteApp = hoistNonReactStatics(RouteApp, App);
+          }
+          if (routesConfig === null || routesConfig === void 0 ? void 0 : routesConfig.globalApp) {
+            return next({
+              App: hoistNonReactStatics(RouteApp, routesConfig.globalApp)
+            });
+          }
+          return next({
+            App: RouteApp
+          });
         }
-    };
+      };
+    }
+  };
 };
-export { beforeCreateRouter, finalRouteConfig, modifyRoutes, routerPlugin };