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

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

@@ -1,149 +1,102 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var runtime_exports = {};
-__export(runtime_exports, {
-  Await: () => import_react_router_dom.Await,
-  BrowserRouter: () => import_react_router_dom.BrowserRouter,
-  Form: () => import_react_router_dom.Form,
-  HashRouter: () => import_react_router_dom.HashRouter,
-  Link: () => import_PrefetchLink.Link,
-  MemoryRouter: () => import_react_router_dom.MemoryRouter,
-  NavLink: () => import_PrefetchLink.NavLink,
-  Navigate: () => import_react_router_dom.Navigate,
-  Outlet: () => import_react_router_dom.Outlet,
-  Route: () => import_react_router_dom.Route,
-  Router: () => import_react_router_dom.Router,
-  RouterProvider: () => import_react_router_dom.RouterProvider,
-  Routes: () => import_react_router_dom.Routes,
-  ScrollRestoration: () => import_react_router_dom.ScrollRestoration,
-  createBrowserRouter: () => import_react_router_dom.createBrowserRouter,
-  createHashRouter: () => import_react_router_dom.createHashRouter,
-  createMemoryRouter: () => import_react_router_dom.createMemoryRouter,
-  createPath: () => import_react_router_dom.createPath,
-  createRoutesFromChildren: () => import_react_router_dom.createRoutesFromChildren,
-  createRoutesFromElements: () => import_react_router_dom.createRoutesFromElements,
-  createSearchParams: () => import_react_router_dom.createSearchParams,
-  default: () => runtime_default,
-  defer: () => import_remix_router.defer,
-  generatePath: () => import_react_router_dom.generatePath,
-  isRouteErrorResponse: () => import_react_router_dom.isRouteErrorResponse,
-  json: () => import_remix_router.json,
-  matchPath: () => import_react_router_dom.matchPath,
-  matchRoutes: () => import_react_router_dom.matchRoutes,
-  modifyRoutes: () => import_plugin2.modifyRoutes,
-  redirect: () => import_remix_router.redirect,
-  renderMatches: () => import_react_router_dom.renderMatches,
-  resolvePath: () => import_react_router_dom.resolvePath,
-  useActionData: () => import_react_router_dom.useActionData,
-  useAsyncError: () => import_react_router_dom.useAsyncError,
-  useAsyncValue: () => import_react_router_dom.useAsyncValue,
-  useBeforeUnload: () => import_react_router_dom.useBeforeUnload,
-  useFetcher: () => import_react_router_dom.useFetcher,
-  useFetchers: () => import_react_router_dom.useFetchers,
-  useFormAction: () => import_react_router_dom.useFormAction,
-  useHref: () => import_react_router_dom.useHref,
-  useInRouterContext: () => import_react_router_dom.useInRouterContext,
-  useLinkClickHandler: () => import_react_router_dom.useLinkClickHandler,
-  useLoaderData: () => import_react_router_dom.useLoaderData,
-  useLocation: () => import_react_router_dom.useLocation,
-  useMatch: () => import_react_router_dom.useMatch,
-  useMatches: () => import_react_router_dom.useMatches,
-  useNavigate: () => import_react_router_dom.useNavigate,
-  useNavigation: () => import_react_router_dom.useNavigation,
-  useNavigationType: () => import_react_router_dom.useNavigationType,
-  useOutlet: () => import_react_router_dom.useOutlet,
-  useOutletContext: () => import_react_router_dom.useOutletContext,
-  useParams: () => import_react_router_dom.useParams,
-  useResolvedPath: () => import_react_router_dom.useResolvedPath,
-  useRevalidator: () => import_react_router_dom.useRevalidator,
-  useRouteError: () => import_react_router_dom.useRouteError,
-  useRouteLoaderData: () => import_react_router_dom.useRouteLoaderData,
-  useRoutes: () => import_react_router_dom.useRoutes,
-  useSearchParams: () => import_react_router_dom.useSearchParams,
-  useSubmit: () => import_react_router_dom.useSubmit
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(runtime_exports);
-var import_plugin = require("./plugin");
-var import_plugin2 = require("./plugin");
-__reExport(runtime_exports, require("./withRouter"), module.exports);
-var import_PrefetchLink = require("./PrefetchLink");
-var import_react_router_dom = require("react-router-dom");
-var import_remix_router = require("@modern-js/utils/universal/remix-router");
-var runtime_default = import_plugin.routerPlugin;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  Await,
-  BrowserRouter,
-  Form,
-  HashRouter,
-  Link,
-  MemoryRouter,
-  NavLink,
-  Navigate,
-  Outlet,
-  Route,
-  Router,
-  RouterProvider,
-  Routes,
-  ScrollRestoration,
-  createBrowserRouter,
-  createHashRouter,
-  createMemoryRouter,
-  createPath,
-  createRoutesFromChildren,
-  createRoutesFromElements,
-  createSearchParams,
-  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
+function _export(target, all) {
+  for (var name in all)
+    Object.defineProperty(target, name, {
+      enumerable: true,
+      get: all[name]
+    });
+}
+_export(exports, {
+  default: () => _default,
+  modifyRoutes: () => _plugin.modifyRoutes,
+  Link: () => _PrefetchLink.Link,
+  NavLink: () => _PrefetchLink.NavLink,
+  useRouteLoaderData: () => useRouteLoaderData,
+  // Routers
+  createBrowserRouter: () => _reactrouterdom.createBrowserRouter,
+  createHashRouter: () => _reactrouterdom.createHashRouter,
+  createMemoryRouter: () => _reactrouterdom.createMemoryRouter,
+  RouterProvider: () => _reactrouterdom.RouterProvider,
+  // Router Components
+  BrowserRouter: () => _reactrouterdom.BrowserRouter,
+  HashRouter: () => _reactrouterdom.HashRouter,
+  MemoryRouter: () => _reactrouterdom.MemoryRouter,
+  Router: () => _reactrouterdom.Router,
+  // Components
+  Await: () => _reactrouterdom.Await,
+  Form: () => _reactrouterdom.Form,
+  Navigate: () => _reactrouterdom.Navigate,
+  Outlet: () => _reactrouterdom.Outlet,
+  Route: () => _reactrouterdom.Route,
+  Routes: () => _reactrouterdom.Routes,
+  ScrollRestoration: () => _reactrouterdom.ScrollRestoration,
+  // Hooks
+  useActionData: () => _reactrouterdom.useActionData,
+  useAsyncError: () => _reactrouterdom.useAsyncError,
+  useAsyncValue: () => _reactrouterdom.useAsyncValue,
+  useBeforeUnload: () => _reactrouterdom.useBeforeUnload,
+  useFetcher: () => _reactrouterdom.useFetcher,
+  useFetchers: () => _reactrouterdom.useFetchers,
+  useFormAction: () => _reactrouterdom.useFormAction,
+  useHref: () => _reactrouterdom.useHref,
+  useInRouterContext: () => _reactrouterdom.useInRouterContext,
+  useLinkClickHandler: () => _reactrouterdom.useLinkClickHandler,
+  useLoaderData: () => _reactrouterdom.useLoaderData,
+  useLocation: () => _reactrouterdom.useLocation,
+  useMatch: () => _reactrouterdom.useMatch,
+  useMatches: () => _reactrouterdom.useMatches,
+  useNavigate: () => _reactrouterdom.useNavigate,
+  useNavigation: () => _reactrouterdom.useNavigation,
+  useNavigationType: () => _reactrouterdom.useNavigationType,
+  useOutlet: () => _reactrouterdom.useOutlet,
+  useOutletContext: () => _reactrouterdom.useOutletContext,
+  useParams: () => _reactrouterdom.useParams,
+  useResolvedPath: () => _reactrouterdom.useResolvedPath,
+  useRevalidator: () => _reactrouterdom.useRevalidator,
+  useRouteError: () => _reactrouterdom.useRouteError,
+  useRoutes: () => _reactrouterdom.useRoutes,
+  useSearchParams: () => _reactrouterdom.useSearchParams,
+  useSubmit: () => _reactrouterdom.useSubmit,
+  // Utilities
+  createRoutesFromChildren: () => _reactrouterdom.createRoutesFromChildren,
+  createRoutesFromElements: () => _reactrouterdom.createRoutesFromElements,
+  createSearchParams: () => _reactrouterdom.createSearchParams,
+  generatePath: () => _reactrouterdom.generatePath,
+  isRouteErrorResponse: () => _reactrouterdom.isRouteErrorResponse,
+  matchPath: () => _reactrouterdom.matchPath,
+  matchRoutes: () => _reactrouterdom.matchRoutes,
+  renderMatches: () => _reactrouterdom.renderMatches,
+  resolvePath: () => _reactrouterdom.resolvePath,
+  createPath: () => _reactrouterdom.createPath,
+  unstable_useBlocker: () => _reactrouterdom.unstable_useBlocker,
+  unstable_usePrompt: () => _reactrouterdom.unstable_usePrompt,
+  defer: () => _remixrouter.defer,
+  json: () => _remixrouter.json,
+  redirect: () => _remixrouter.redirect
 });
+const _reactrouterdom = require("react-router-dom");
+const _plugin = require("./plugin");
+_export_star(require("./withRouter"), exports);
+const _PrefetchLink = require("./PrefetchLink");
+const _remixrouter = require("@modern-js/utils/universal/remix-router");
+function _export_star(from, to) {
+  Object.keys(from).forEach(function(k) {
+    if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
+      Object.defineProperty(to, k, {
+        enumerable: true,
+        get: function() {
+          return from[k];
+        }
+      });
+    }
+  });
+  return from;
+}
+const _default = _plugin.routerPlugin;
+const useRouteLoaderData = (routeId) => {
+  const realRouteId = routeId.replace(/\((.*?)\)/g, "[$1]");
+  return (0, _reactrouterdom.useRouteLoaderData)(realRouteId);
+};

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

@@ -1,44 +1,32 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+function _export(target, all) {
   for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var plugin_exports = {};
-__export(plugin_exports, {
-  beforeCreateRouter: () => beforeCreateRouter,
+    Object.defineProperty(target, name, {
+      enumerable: true,
+      get: all[name]
+    });
+}
+_export(exports, {
   finalRouteConfig: () => finalRouteConfig,
+  beforeCreateRouter: () => beforeCreateRouter,
   modifyRoutes: () => modifyRoutes,
   routerPlugin: () => routerPlugin
 });
-module.exports = __toCommonJS(plugin_exports);
-var import_jsx_runtime = require("react/jsx-runtime");
-var import_react_router_dom = require("react-router-dom");
-var import_hoist_non_react_statics = __toESM(require("hoist-non-react-statics"));
-var import_runtime = require("@modern-js/utils/runtime");
-var import_hooks = require("./hooks");
-var import_utils = require("./utils");
+const _jsxruntime = require("react/jsx-runtime");
+const _react = /* @__PURE__ */ _interop_require_default(require("react"));
+const _reactrouterdom = require("react-router-dom");
+const _hoistnonreactstatics = /* @__PURE__ */ _interop_require_default(require("hoist-non-react-statics"));
+const _runtime = require("@modern-js/utils/runtime");
+const _hooks = require("./hooks");
+const _utils = require("./utils");
+function _interop_require_default(obj) {
+  return obj && obj.__esModule ? obj : {
+    default: obj
+  };
+}
 let finalRouteConfig = {
   routes: []
 };
@@ -49,83 +37,82 @@ function modifyRoutes(modifyFunction) {
     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
-}) => {
+const routerPlugin = ({ serverBase = [], supportHtml5History = true, basename = "", routesConfig, createRoutes }) => {
   const select = (pathname) => serverBase.find((baseUrl) => pathname.search(baseUrl) === 0) || "/";
   let routes = [];
   finalRouteConfig = routesConfig;
-  window._SERVER_DATA = (0, import_runtime.parsedJSONFromElement)("__MODERN_SERVER_DATA__");
+  window._SERVER_DATA = (0, _runtime.parsedJSONFromElement)("__MODERN_SERVER_DATA__");
   return {
     name: "@modern-js/plugin-router",
     registerHook: {
-      modifyRoutes: import_hooks.modifyRoutes
+      modifyRoutes: _hooks.modifyRoutes
     },
     setup: (api) => {
       return {
         init({ context }, next) {
           context.router = {
-            useMatches: import_react_router_dom.useMatches,
-            useLocation: import_react_router_dom.useLocation
+            useMatches: _reactrouterdom.useMatches,
+            useLocation: _reactrouterdom.useLocation
           };
           Object.defineProperty(context, "routes", {
             get() {
               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() : (0, import_react_router_dom.createRoutesFromElements)(
-                (0, import_utils.renderRoutes)({
-                  routesConfig: finalRouteConfig,
-                  props
-                })
-              );
+              routes = createRoutes ? createRoutes() : (0, _reactrouterdom.createRoutesFromElements)((0, _utils.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 _basename = baseUrl === "/" ? (0, import_utils.urlJoin)(baseUrl, basename) : baseUrl;
+              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 === "/" ? (0, _utils.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: (0, import_utils.deserializeErrors)(hydrationData.errors)
+                  errors: (0, _utils.deserializeErrors)(hydrationData.errors)
                 };
               }
-              const router = supportHtml5History ? (0, import_react_router_dom.createBrowserRouter)(routes, {
+              const router = supportHtml5History ? (0, _reactrouterdom.createBrowserRouter)(routes, {
                 basename: _basename,
                 hydrationData
-              }) : (0, import_react_router_dom.createHashRouter)(routes, {
+              }) : (0, _reactrouterdom.createHashRouter)(routes, {
                 basename: _basename,
                 hydrationData
               });
-              return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, { ...props, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.RouterProvider, { router }) });
+              return /* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
+                ...props,
+                children: /* @__PURE__ */ (0, _jsxruntime.jsx)(_reactrouterdom.RouterProvider, {
+                  router
+                })
+              });
             };
           };
           let RouteApp = getRouteApp();
           if (App) {
-            RouteApp = (0, import_hoist_non_react_statics.default)(RouteApp, App);
+            RouteApp = (0, _hoistnonreactstatics.default)(RouteApp, App);
           }
-          if (routesConfig == null ? void 0 : routesConfig.globalApp) {
+          if (routesConfig === null || routesConfig === void 0 ? void 0 : routesConfig.globalApp) {
             return next({
-              App: (0, import_hoist_non_react_statics.default)(RouteApp, routesConfig.globalApp)
+              App: (0, _hoistnonreactstatics.default)(RouteApp, routesConfig.globalApp)
             });
           }
           return next({
@@ -136,10 +123,3 @@ const routerPlugin = ({
     }
   };
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  beforeCreateRouter,
-  finalRouteConfig,
-  modifyRoutes,
-  routerPlugin
-});