@modern-js/runtime 2.46.1 → 2.47.1

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

@@ -19,81 +19,25 @@ var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "defau
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var runtime_exports = {};
 __export(runtime_exports, {
-  Await: () => import_router2.Await,
-  BrowserRouter: () => import_router2.BrowserRouter,
-  Form: () => import_router2.Form,
-  HashRouter: () => import_router2.HashRouter,
   Link: () => import_PrefetchLink.Link,
-  MemoryRouter: () => import_router2.MemoryRouter,
   NavLink: () => import_PrefetchLink.NavLink,
-  Navigate: () => import_router2.Navigate,
-  Outlet: () => import_router2.Outlet,
-  Route: () => import_router2.Route,
-  Router: () => import_router2.Router,
-  RouterProvider: () => import_router2.RouterProvider,
-  Routes: () => import_router2.Routes,
-  ScrollRestoration: () => import_router2.ScrollRestoration,
-  createBrowserRouter: () => import_router2.createBrowserRouter,
-  createHashRouter: () => import_router2.createHashRouter,
-  createMemoryRouter: () => import_router2.createMemoryRouter,
-  createPath: () => import_router2.createPath,
-  createRoutesFromChildren: () => import_router2.createRoutesFromChildren,
-  createRoutesFromElements: () => import_router2.createRoutesFromElements,
-  createSearchParams: () => import_router2.createSearchParams,
   createShouldRevalidate: () => import_routeModule.createShouldRevalidate,
   default: () => runtime_default,
-  defer: () => import_router2.defer,
-  generatePath: () => import_router2.generatePath,
   handleRouteModule: () => import_routeModule.handleRouteModule,
   handleRouteModuleError: () => import_routeModule.handleRouteModuleError,
-  isRouteErrorResponse: () => import_router2.isRouteErrorResponse,
-  json: () => import_router2.json,
-  matchPath: () => import_router2.matchPath,
-  matchRoutes: () => import_router2.matchRoutes,
   modifyRoutes: () => import_plugin2.modifyRoutes,
-  redirect: () => import_router2.redirect,
-  renderMatches: () => import_router2.renderMatches,
   renderRoutes: () => import_utils.renderRoutes,
-  resolvePath: () => import_router2.resolvePath,
-  unstable_useBlocker: () => import_router2.unstable_useBlocker,
-  unstable_usePrompt: () => import_router2.unstable_usePrompt,
-  useActionData: () => import_router2.useActionData,
-  useAsyncError: () => import_router2.useAsyncError,
-  useAsyncValue: () => import_router2.useAsyncValue,
-  useBeforeUnload: () => import_router2.useBeforeUnload,
-  useFetcher: () => import_router2.useFetcher,
-  useFetchers: () => import_router2.useFetchers,
-  useFormAction: () => import_router2.useFormAction,
-  useHref: () => import_router2.useHref,
-  useInRouterContext: () => import_router2.useInRouterContext,
-  useLinkClickHandler: () => import_router2.useLinkClickHandler,
-  useLoaderData: () => import_router2.useLoaderData,
-  useLocation: () => import_router2.useLocation,
-  useMatch: () => import_router2.useMatch,
-  useMatches: () => import_router2.useMatches,
-  useNavigate: () => import_router2.useNavigate,
-  useNavigation: () => import_router2.useNavigation,
-  useNavigationType: () => import_router2.useNavigationType,
-  useOutlet: () => import_router2.useOutlet,
-  useOutletContext: () => import_router2.useOutletContext,
-  useParams: () => import_router2.useParams,
-  useResolvedPath: () => import_router2.useResolvedPath,
-  useRevalidator: () => import_router2.useRevalidator,
-  useRouteError: () => import_router2.useRouteError,
-  useRouteLoaderData: () => useRouteLoaderData,
-  useRoutes: () => import_router2.useRoutes,
-  useSearchParams: () => import_router2.useSearchParams,
-  useSubmit: () => import_router2.useSubmit
+  useRouteLoaderData: () => useRouteLoaderData
 });
 module.exports = __toCommonJS(runtime_exports);
 var import_router = require("@modern-js/runtime-utils/router");
 var import_plugin = require("./plugin");
+__reExport(runtime_exports, require("@modern-js/runtime-utils/router"), module.exports);
 var import_utils = require("./utils");
 var import_plugin2 = require("./plugin");
 __reExport(runtime_exports, require("./withRouter"), module.exports);
 var import_PrefetchLink = require("./PrefetchLink");
 var import_routeModule = require("./routeModule");
-var import_router2 = require("@modern-js/runtime-utils/router");
 var runtime_default = import_plugin.routerPlugin;
 const useRouteLoaderData = (routeId) => {
   const realRouteId = routeId.replace(/\[(.*?)\]/g, "($1)");
@@ -101,69 +45,14 @@ const useRouteLoaderData = (routeId) => {
 };
 // 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,
   createShouldRevalidate,
-  defer,
-  generatePath,
   handleRouteModule,
   handleRouteModuleError,
-  isRouteErrorResponse,
-  json,
-  matchPath,
-  matchRoutes,
   modifyRoutes,
-  redirect,
-  renderMatches,
   renderRoutes,
-  resolvePath,
-  unstable_useBlocker,
-  unstable_usePrompt,
-  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,
+  ...require("@modern-js/runtime-utils/router"),
   ...require("./withRouter")
 });

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

@@ -70,7 +70,8 @@ const routerPlugin = ({ serverBase = [], supportHtml5History = true, basename =
         init({ context }, next) {
           context.router = {
             useMatches: import_router.useMatches,
-            useLocation: import_router.useLocation
+            useLocation: import_router.useLocation,
+            useHref: import_router.useHref
           };
           Object.defineProperty(context, "routes", {
             get() {

package/dist/cjs/ssr/index.js

@@ -47,8 +47,10 @@ const ssr = (config) => ({
   setup: () => {
     const mockResp = (0, import_utils.mockResponse)();
     if (config.inlineScript === false) {
-      window._SSR_DATA = (0, import_parsed.parsedJSONFromElement)(import_constants.SSR_DATA_JSON_ID);
-      window._ROUTER_DATA = (0, import_parsed.parsedJSONFromElement)(import_constants.ROUTER_DATA_JSON_ID);
+      const ssrData = (0, import_parsed.parsedJSONFromElement)(import_constants.SSR_DATA_JSON_ID);
+      window._SSR_DATA = ssrData || window._SSR_DATA;
+      const routeData = (0, import_parsed.parsedJSONFromElement)(import_constants.ROUTER_DATA_JSON_ID);
+      window._ROUTER_DATA = routeData || window._ROUTER_DATA;
     }
     return {
       client: async ({ App, context, ModernRender, ModernHydrate }) => {

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

@@ -1,5 +1,6 @@
 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";
@@ -10,128 +11,14 @@ var useRouteLoaderData = function(routeId) {
   return useRouteData(realRouteId);
 };
 import { createShouldRevalidate, handleRouteModule, handleRouteModuleError } from "./routeModule";
-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,
-  unstable_useBlocker,
-  unstable_usePrompt,
-  defer,
-  json,
-  redirect
-} from "@modern-js/runtime-utils/router";
 export {
-  Await,
-  BrowserRouter,
-  Form,
-  HashRouter,
   Link,
-  MemoryRouter,
   NavLink,
-  Navigate,
-  Outlet,
-  Route,
-  Router,
-  RouterProvider,
-  Routes,
-  ScrollRestoration,
-  createBrowserRouter,
-  createHashRouter,
-  createMemoryRouter,
-  createPath,
-  createRoutesFromChildren,
-  createRoutesFromElements,
-  createSearchParams,
   createShouldRevalidate,
   runtime_default as default,
-  defer,
-  generatePath,
   handleRouteModule,
   handleRouteModuleError,
-  isRouteErrorResponse,
-  json,
-  matchPath,
-  matchRoutes,
   modifyRoutes,
-  redirect,
-  renderMatches,
   renderRoutes,
-  resolvePath,
-  unstable_useBlocker,
-  unstable_usePrompt,
-  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
+  useRouteLoaderData
 };

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

@@ -3,7 +3,7 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useContext, useMemo } from "react";
-import { createBrowserRouter, createHashRouter, RouterProvider, createRoutesFromElements, useMatches, useLocation } from "@modern-js/runtime-utils/router";
+import { createBrowserRouter, createHashRouter, RouterProvider, createRoutesFromElements, useMatches, useLocation, useHref } from "@modern-js/runtime-utils/router";
 import hoistNonReactStatics from "hoist-non-react-statics";
 import { parsedJSONFromElement } from "@modern-js/runtime-utils/parsed";
 import { RuntimeReactContext } from "../../core";
@@ -43,7 +43,8 @@ var routerPlugin = function(param) {
           var context = param2.context;
           context.router = {
             useMatches,
-            useLocation
+            useLocation,
+            useHref
           };
           Object.defineProperty(context, "routes", {
             get: function get() {

package/dist/esm/ssr/index.js

@@ -16,8 +16,10 @@ var ssr = function(config) {
     setup: function() {
       var mockResp = mockResponse();
       if (config.inlineScript === false) {
-        window._SSR_DATA = parsedJSONFromElement(SSR_DATA_JSON_ID);
-        window._ROUTER_DATA = parsedJSONFromElement(ROUTER_DATA_JSON_ID);
+        var ssrData = parsedJSONFromElement(SSR_DATA_JSON_ID);
+        window._SSR_DATA = ssrData || window._SSR_DATA;
+        var routeData = parsedJSONFromElement(ROUTER_DATA_JSON_ID);
+        window._ROUTER_DATA = routeData || window._ROUTER_DATA;
       }
       return {
         client: function() {

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

@@ -1,5 +1,6 @@
 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";
@@ -10,128 +11,14 @@ const useRouteLoaderData = (routeId) => {
   return useRouteData(realRouteId);
 };
 import { createShouldRevalidate, handleRouteModule, handleRouteModuleError } from "./routeModule";
-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,
-  unstable_useBlocker,
-  unstable_usePrompt,
-  defer,
-  json,
-  redirect
-} from "@modern-js/runtime-utils/router";
 export {
-  Await,
-  BrowserRouter,
-  Form,
-  HashRouter,
   Link,
-  MemoryRouter,
   NavLink,
-  Navigate,
-  Outlet,
-  Route,
-  Router,
-  RouterProvider,
-  Routes,
-  ScrollRestoration,
-  createBrowserRouter,
-  createHashRouter,
-  createMemoryRouter,
-  createPath,
-  createRoutesFromChildren,
-  createRoutesFromElements,
-  createSearchParams,
   createShouldRevalidate,
   runtime_default as default,
-  defer,
-  generatePath,
   handleRouteModule,
   handleRouteModuleError,
-  isRouteErrorResponse,
-  json,
-  matchPath,
-  matchRoutes,
   modifyRoutes,
-  redirect,
-  renderMatches,
   renderRoutes,
-  resolvePath,
-  unstable_useBlocker,
-  unstable_usePrompt,
-  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
+  useRouteLoaderData
 };

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

@@ -1,6 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useContext, useMemo } from "react";
-import { createBrowserRouter, createHashRouter, RouterProvider, createRoutesFromElements, useMatches, useLocation } from "@modern-js/runtime-utils/router";
+import { createBrowserRouter, createHashRouter, RouterProvider, createRoutesFromElements, useMatches, useLocation, useHref } from "@modern-js/runtime-utils/router";
 import hoistNonReactStatics from "hoist-non-react-statics";
 import { parsedJSONFromElement } from "@modern-js/runtime-utils/parsed";
 import { RuntimeReactContext } from "../../core";
@@ -34,7 +34,8 @@ const routerPlugin = ({ serverBase = [], supportHtml5History = true, basename =
         init({ context }, next) {
           context.router = {
             useMatches,
-            useLocation
+            useLocation,
+            useHref
           };
           Object.defineProperty(context, "routes", {
             get() {

package/dist/esm-node/ssr/index.js

@@ -11,8 +11,10 @@ const ssr = (config) => ({
   setup: () => {
     const mockResp = mockResponse();
     if (config.inlineScript === false) {
-      window._SSR_DATA = parsedJSONFromElement(SSR_DATA_JSON_ID);
-      window._ROUTER_DATA = parsedJSONFromElement(ROUTER_DATA_JSON_ID);
+      const ssrData = parsedJSONFromElement(SSR_DATA_JSON_ID);
+      window._SSR_DATA = ssrData || window._SSR_DATA;
+      const routeData = parsedJSONFromElement(ROUTER_DATA_JSON_ID);
+      window._ROUTER_DATA = routeData || window._ROUTER_DATA;
     }
     return {
       client: async ({ App, context, ModernRender, ModernHydrate }) => {

package/dist/types/router/runtime/index.d.ts

@@ -1,6 +1,7 @@
 import { useRouteLoaderData as useRouteData } from '@modern-js/runtime-utils/router';
 import { routerPlugin } from './plugin';
 import type { SingleRouteConfig, RouterConfig } from './types';
+export * from '@modern-js/runtime-utils/router';
 export type { SingleRouteConfig, RouterConfig };
 export { renderRoutes } from './utils';
 export default routerPlugin;
@@ -11,5 +12,3 @@ export type { LinkProps, NavLinkProps } from './PrefetchLink';
 export declare const useRouteLoaderData: typeof useRouteData;
 export { createShouldRevalidate, handleRouteModule, handleRouteModuleError, } from './routeModule';
 export type { LoaderFunction, LoaderFunctionArgs } from './types';
-export type { FormEncType, FormMethod, GetScrollRestorationKeyFunction, ParamKeyValuePair, SubmitOptions, URLSearchParamsInit, FetcherWithComponents, BrowserRouterProps, HashRouterProps, HistoryRouterProps, FormProps, ScrollRestorationProps, SubmitFunction, ActionFunction, ActionFunctionArgs, AwaitProps, unstable_Blocker, unstable_BlockerFunction, DataRouteMatch, DataRouteObject, Fetcher, Hash, IndexRouteObject, IndexRouteProps, JsonFunction, LayoutRouteProps, Location, MemoryRouterProps, NavigateFunction, NavigateOptions, NavigateProps, Navigation, Navigator, NonIndexRouteObject, OutletProps, Params, ParamParseKey, Path, PathMatch, Pathname, PathPattern, PathRouteProps, RedirectFunction, RelativeRoutingType, RouteMatch, RouteObject, RouteProps, RouterProps, RouterProviderProps, RoutesProps, Search, ShouldRevalidateFunction, To, } from '@modern-js/runtime-utils/router';
-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, defer, json, redirect, } from '@modern-js/runtime-utils/router';

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.46.1",
+  "version": "2.47.1",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -171,10 +171,10 @@
     "react-side-effect": "^2.1.1",
     "styled-components": "^5.3.1",
     "@swc/helpers": "0.5.3",
-    "@modern-js/utils": "2.46.1",
-    "@modern-js/types": "2.46.1",
-    "@modern-js/plugin": "2.46.1",
-    "@modern-js/runtime-utils": "2.46.1"
+    "@modern-js/plugin": "2.47.1",
+    "@modern-js/types": "2.47.1",
+    "@modern-js/utils": "2.47.1",
+    "@modern-js/runtime-utils": "2.47.1"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -195,11 +195,11 @@
     "ts-jest": "^29.1.0",
     "typescript": "^5",
     "webpack": "^5.89.0",
-    "@modern-js/app-tools": "2.46.1",
-    "@modern-js/core": "2.46.1",
-    "@modern-js/server-core": "2.46.1",
-    "@scripts/build": "2.46.1",
-    "@scripts/jest-config": "2.46.1"
+    "@modern-js/app-tools": "2.47.1",
+    "@modern-js/core": "2.47.1",
+    "@modern-js/server-core": "2.47.1",
+    "@scripts/build": "2.47.1",
+    "@scripts/jest-config": "2.47.1"
   },
   "sideEffects": false,
   "publishConfig": {