@modern-js/runtime 2.46.0 → 2.47.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/dist/cjs/router/runtime/index.js +3 -114
  2. package/dist/cjs/router/runtime/plugin.js +2 -1
  3. package/dist/esm/router/runtime/index.js +2 -115
  4. package/dist/esm/router/runtime/plugin.js +3 -2
  5. package/dist/esm-node/router/runtime/index.js +2 -115
  6. package/dist/esm-node/router/runtime/plugin.js +3 -2
  7. package/dist/types/router/runtime/index.d.ts +1 -2
  8. package/package.json +10 -10
package/dist/cjs/router/runtime/index.js CHANGED
@@ -19,81 +19,25 @@ var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "defau
19
19
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
20
20
  var runtime_exports = {};
21
21
  __export(runtime_exports, {
22
- Await: () => import_router2.Await,
23
- BrowserRouter: () => import_router2.BrowserRouter,
24
- Form: () => import_router2.Form,
25
- HashRouter: () => import_router2.HashRouter,
26
22
  Link: () => import_PrefetchLink.Link,
27
- MemoryRouter: () => import_router2.MemoryRouter,
28
23
  NavLink: () => import_PrefetchLink.NavLink,
29
- Navigate: () => import_router2.Navigate,
30
- Outlet: () => import_router2.Outlet,
31
- Route: () => import_router2.Route,
32
- Router: () => import_router2.Router,
33
- RouterProvider: () => import_router2.RouterProvider,
34
- Routes: () => import_router2.Routes,
35
- ScrollRestoration: () => import_router2.ScrollRestoration,
36
- createBrowserRouter: () => import_router2.createBrowserRouter,
37
- createHashRouter: () => import_router2.createHashRouter,
38
- createMemoryRouter: () => import_router2.createMemoryRouter,
39
- createPath: () => import_router2.createPath,
40
- createRoutesFromChildren: () => import_router2.createRoutesFromChildren,
41
- createRoutesFromElements: () => import_router2.createRoutesFromElements,
42
- createSearchParams: () => import_router2.createSearchParams,
43
24
  createShouldRevalidate: () => import_routeModule.createShouldRevalidate,
44
25
  default: () => runtime_default,
45
- defer: () => import_router2.defer,
46
- generatePath: () => import_router2.generatePath,
47
26
  handleRouteModule: () => import_routeModule.handleRouteModule,
48
27
  handleRouteModuleError: () => import_routeModule.handleRouteModuleError,
49
- isRouteErrorResponse: () => import_router2.isRouteErrorResponse,
50
- json: () => import_router2.json,
51
- matchPath: () => import_router2.matchPath,
52
- matchRoutes: () => import_router2.matchRoutes,
53
28
  modifyRoutes: () => import_plugin2.modifyRoutes,
54
- redirect: () => import_router2.redirect,
55
- renderMatches: () => import_router2.renderMatches,
56
29
  renderRoutes: () => import_utils.renderRoutes,
57
- resolvePath: () => import_router2.resolvePath,
58
- unstable_useBlocker: () => import_router2.unstable_useBlocker,
59
- unstable_usePrompt: () => import_router2.unstable_usePrompt,
60
- useActionData: () => import_router2.useActionData,
61
- useAsyncError: () => import_router2.useAsyncError,
62
- useAsyncValue: () => import_router2.useAsyncValue,
63
- useBeforeUnload: () => import_router2.useBeforeUnload,
64
- useFetcher: () => import_router2.useFetcher,
65
- useFetchers: () => import_router2.useFetchers,
66
- useFormAction: () => import_router2.useFormAction,
67
- useHref: () => import_router2.useHref,
68
- useInRouterContext: () => import_router2.useInRouterContext,
69
- useLinkClickHandler: () => import_router2.useLinkClickHandler,
70
- useLoaderData: () => import_router2.useLoaderData,
71
- useLocation: () => import_router2.useLocation,
72
- useMatch: () => import_router2.useMatch,
73
- useMatches: () => import_router2.useMatches,
74
- useNavigate: () => import_router2.useNavigate,
75
- useNavigation: () => import_router2.useNavigation,
76
- useNavigationType: () => import_router2.useNavigationType,
77
- useOutlet: () => import_router2.useOutlet,
78
- useOutletContext: () => import_router2.useOutletContext,
79
- useParams: () => import_router2.useParams,
80
- useResolvedPath: () => import_router2.useResolvedPath,
81
- useRevalidator: () => import_router2.useRevalidator,
82
- useRouteError: () => import_router2.useRouteError,
83
- useRouteLoaderData: () => useRouteLoaderData,
84
- useRoutes: () => import_router2.useRoutes,
85
- useSearchParams: () => import_router2.useSearchParams,
86
- useSubmit: () => import_router2.useSubmit
30
+ useRouteLoaderData: () => useRouteLoaderData
87
31
  });
88
32
  module.exports = __toCommonJS(runtime_exports);
89
33
  var import_router = require("@modern-js/runtime-utils/router");
90
34
  var import_plugin = require("./plugin");
35
+ __reExport(runtime_exports, require("@modern-js/runtime-utils/router"), module.exports);
91
36
  var import_utils = require("./utils");
92
37
  var import_plugin2 = require("./plugin");
93
38
  __reExport(runtime_exports, require("./withRouter"), module.exports);
94
39
  var import_PrefetchLink = require("./PrefetchLink");
95
40
  var import_routeModule = require("./routeModule");
96
- var import_router2 = require("@modern-js/runtime-utils/router");
97
41
  var runtime_default = import_plugin.routerPlugin;
98
42
  const useRouteLoaderData = (routeId) => {
99
43
  const realRouteId = routeId.replace(/\[(.*?)\]/g, "($1)");
@@ -101,69 +45,14 @@ const useRouteLoaderData = (routeId) => {
101
45
  };
102
46
  // Annotate the CommonJS export names for ESM import in node:
103
47
  0 && (module.exports = {
104
- Await,
105
- BrowserRouter,
106
- Form,
107
- HashRouter,
108
48
  Link,
109
- MemoryRouter,
110
49
  NavLink,
111
- Navigate,
112
- Outlet,
113
- Route,
114
- Router,
115
- RouterProvider,
116
- Routes,
117
- ScrollRestoration,
118
- createBrowserRouter,
119
- createHashRouter,
120
- createMemoryRouter,
121
- createPath,
122
- createRoutesFromChildren,
123
- createRoutesFromElements,
124
- createSearchParams,
125
50
  createShouldRevalidate,
126
- defer,
127
- generatePath,
128
51
  handleRouteModule,
129
52
  handleRouteModuleError,
130
- isRouteErrorResponse,
131
- json,
132
- matchPath,
133
- matchRoutes,
134
53
  modifyRoutes,
135
- redirect,
136
- renderMatches,
137
54
  renderRoutes,
138
- resolvePath,
139
- unstable_useBlocker,
140
- unstable_usePrompt,
141
- useActionData,
142
- useAsyncError,
143
- useAsyncValue,
144
- useBeforeUnload,
145
- useFetcher,
146
- useFetchers,
147
- useFormAction,
148
- useHref,
149
- useInRouterContext,
150
- useLinkClickHandler,
151
- useLoaderData,
152
- useLocation,
153
- useMatch,
154
- useMatches,
155
- useNavigate,
156
- useNavigation,
157
- useNavigationType,
158
- useOutlet,
159
- useOutletContext,
160
- useParams,
161
- useResolvedPath,
162
- useRevalidator,
163
- useRouteError,
164
55
  useRouteLoaderData,
165
- useRoutes,
166
- useSearchParams,
167
- useSubmit,
56
+ ...require("@modern-js/runtime-utils/router"),
168
57
  ...require("./withRouter")
169
58
  });
package/dist/cjs/router/runtime/plugin.js CHANGED
@@ -70,7 +70,8 @@ const routerPlugin = ({ serverBase = [], supportHtml5History = true, basename =
70
70
  init({ context }, next) {
71
71
  context.router = {
72
72
  useMatches: import_router.useMatches,
73
- useLocation: import_router.useLocation
73
+ useLocation: import_router.useLocation,
74
+ useHref: import_router.useHref
74
75
  };
75
76
  Object.defineProperty(context, "routes", {
76
77
  get() {
package/dist/esm/router/runtime/index.js CHANGED
@@ -1,5 +1,6 @@
1
1
  import { useRouteLoaderData as useRouteData } from "@modern-js/runtime-utils/router";
2
2
  import { routerPlugin } from "./plugin";
3
+ export * from "@modern-js/runtime-utils/router";
3
4
  import { renderRoutes } from "./utils";
4
5
  var runtime_default = routerPlugin;
5
6
  import { modifyRoutes } from "./plugin";
@@ -10,128 +11,14 @@ var useRouteLoaderData = function(routeId) {
10
11
  return useRouteData(realRouteId);
11
12
  };
12
13
  import { createShouldRevalidate, handleRouteModule, handleRouteModuleError } from "./routeModule";
13
- import {
14
- createBrowserRouter,
15
- createHashRouter,
16
- createMemoryRouter,
17
- RouterProvider,
18
- BrowserRouter,
19
- HashRouter,
20
- MemoryRouter,
21
- Router,
22
- Await,
23
- Form,
24
- Navigate,
25
- Outlet,
26
- Route,
27
- Routes,
28
- ScrollRestoration,
29
- useActionData,
30
- useAsyncError,
31
- useAsyncValue,
32
- useBeforeUnload,
33
- useFetcher,
34
- useFetchers,
35
- useFormAction,
36
- useHref,
37
- useInRouterContext,
38
- useLinkClickHandler,
39
- useLoaderData,
40
- useLocation,
41
- useMatch,
42
- useMatches,
43
- useNavigate,
44
- useNavigation,
45
- useNavigationType,
46
- useOutlet,
47
- useOutletContext,
48
- useParams,
49
- useResolvedPath,
50
- useRevalidator,
51
- useRouteError,
52
- useRoutes,
53
- useSearchParams,
54
- useSubmit,
55
- createRoutesFromChildren,
56
- createRoutesFromElements,
57
- createSearchParams,
58
- generatePath,
59
- isRouteErrorResponse,
60
- matchPath,
61
- matchRoutes,
62
- renderMatches,
63
- resolvePath,
64
- createPath,
65
- unstable_useBlocker,
66
- unstable_usePrompt,
67
- defer,
68
- json,
69
- redirect
70
- } from "@modern-js/runtime-utils/router";
71
14
  export {
72
- Await,
73
- BrowserRouter,
74
- Form,
75
- HashRouter,
76
15
  Link,
77
- MemoryRouter,
78
16
  NavLink,
79
- Navigate,
80
- Outlet,
81
- Route,
82
- Router,
83
- RouterProvider,
84
- Routes,
85
- ScrollRestoration,
86
- createBrowserRouter,
87
- createHashRouter,
88
- createMemoryRouter,
89
- createPath,
90
- createRoutesFromChildren,
91
- createRoutesFromElements,
92
- createSearchParams,
93
17
  createShouldRevalidate,
94
18
  runtime_default as default,
95
- defer,
96
- generatePath,
97
19
  handleRouteModule,
98
20
  handleRouteModuleError,
99
- isRouteErrorResponse,
100
- json,
101
- matchPath,
102
- matchRoutes,
103
21
  modifyRoutes,
104
- redirect,
105
- renderMatches,
106
22
  renderRoutes,
107
- resolvePath,
108
- unstable_useBlocker,
109
- unstable_usePrompt,
110
- useActionData,
111
- useAsyncError,
112
- useAsyncValue,
113
- useBeforeUnload,
114
- useFetcher,
115
- useFetchers,
116
- useFormAction,
117
- useHref,
118
- useInRouterContext,
119
- useLinkClickHandler,
120
- useLoaderData,
121
- useLocation,
122
- useMatch,
123
- useMatches,
124
- useNavigate,
125
- useNavigation,
126
- useNavigationType,
127
- useOutlet,
128
- useOutletContext,
129
- useParams,
130
- useResolvedPath,
131
- useRevalidator,
132
- useRouteError,
133
- useRouteLoaderData,
134
- useRoutes,
135
- useSearchParams,
136
- useSubmit
23
+ useRouteLoaderData
137
24
  };
package/dist/esm/router/runtime/plugin.js CHANGED
@@ -3,7 +3,7 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
3
3
  import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
4
4
  import { jsx as _jsx } from "react/jsx-runtime";
5
5
  import { useContext, useMemo } from "react";
6
- import { createBrowserRouter, createHashRouter, RouterProvider, createRoutesFromElements, useMatches, useLocation } from "@modern-js/runtime-utils/router";
6
+ import { createBrowserRouter, createHashRouter, RouterProvider, createRoutesFromElements, useMatches, useLocation, useHref } from "@modern-js/runtime-utils/router";
7
7
  import hoistNonReactStatics from "hoist-non-react-statics";
8
8
  import { parsedJSONFromElement } from "@modern-js/runtime-utils/parsed";
9
9
  import { RuntimeReactContext } from "../../core";
@@ -43,7 +43,8 @@ var routerPlugin = function(param) {
43
43
  var context = param2.context;
44
44
  context.router = {
45
45
  useMatches,
46
- useLocation
46
+ useLocation,
47
+ useHref
47
48
  };
48
49
  Object.defineProperty(context, "routes", {
49
50
  get: function get() {
package/dist/esm-node/router/runtime/index.js CHANGED
@@ -1,5 +1,6 @@
1
1
  import { useRouteLoaderData as useRouteData } from "@modern-js/runtime-utils/router";
2
2
  import { routerPlugin } from "./plugin";
3
+ export * from "@modern-js/runtime-utils/router";
3
4
  import { renderRoutes } from "./utils";
4
5
  var runtime_default = routerPlugin;
5
6
  import { modifyRoutes } from "./plugin";
@@ -10,128 +11,14 @@ const useRouteLoaderData = (routeId) => {
10
11
  return useRouteData(realRouteId);
11
12
  };
12
13
  import { createShouldRevalidate, handleRouteModule, handleRouteModuleError } from "./routeModule";
13
- import {
14
- createBrowserRouter,
15
- createHashRouter,
16
- createMemoryRouter,
17
- RouterProvider,
18
- BrowserRouter,
19
- HashRouter,
20
- MemoryRouter,
21
- Router,
22
- Await,
23
- Form,
24
- Navigate,
25
- Outlet,
26
- Route,
27
- Routes,
28
- ScrollRestoration,
29
- useActionData,
30
- useAsyncError,
31
- useAsyncValue,
32
- useBeforeUnload,
33
- useFetcher,
34
- useFetchers,
35
- useFormAction,
36
- useHref,
37
- useInRouterContext,
38
- useLinkClickHandler,
39
- useLoaderData,
40
- useLocation,
41
- useMatch,
42
- useMatches,
43
- useNavigate,
44
- useNavigation,
45
- useNavigationType,
46
- useOutlet,
47
- useOutletContext,
48
- useParams,
49
- useResolvedPath,
50
- useRevalidator,
51
- useRouteError,
52
- useRoutes,
53
- useSearchParams,
54
- useSubmit,
55
- createRoutesFromChildren,
56
- createRoutesFromElements,
57
- createSearchParams,
58
- generatePath,
59
- isRouteErrorResponse,
60
- matchPath,
61
- matchRoutes,
62
- renderMatches,
63
- resolvePath,
64
- createPath,
65
- unstable_useBlocker,
66
- unstable_usePrompt,
67
- defer,
68
- json,
69
- redirect
70
- } from "@modern-js/runtime-utils/router";
71
14
  export {
72
- Await,
73
- BrowserRouter,
74
- Form,
75
- HashRouter,
76
15
  Link,
77
- MemoryRouter,
78
16
  NavLink,
79
- Navigate,
80
- Outlet,
81
- Route,
82
- Router,
83
- RouterProvider,
84
- Routes,
85
- ScrollRestoration,
86
- createBrowserRouter,
87
- createHashRouter,
88
- createMemoryRouter,
89
- createPath,
90
- createRoutesFromChildren,
91
- createRoutesFromElements,
92
- createSearchParams,
93
17
  createShouldRevalidate,
94
18
  runtime_default as default,
95
- defer,
96
- generatePath,
97
19
  handleRouteModule,
98
20
  handleRouteModuleError,
99
- isRouteErrorResponse,
100
- json,
101
- matchPath,
102
- matchRoutes,
103
21
  modifyRoutes,
104
- redirect,
105
- renderMatches,
106
22
  renderRoutes,
107
- resolvePath,
108
- unstable_useBlocker,
109
- unstable_usePrompt,
110
- useActionData,
111
- useAsyncError,
112
- useAsyncValue,
113
- useBeforeUnload,
114
- useFetcher,
115
- useFetchers,
116
- useFormAction,
117
- useHref,
118
- useInRouterContext,
119
- useLinkClickHandler,
120
- useLoaderData,
121
- useLocation,
122
- useMatch,
123
- useMatches,
124
- useNavigate,
125
- useNavigation,
126
- useNavigationType,
127
- useOutlet,
128
- useOutletContext,
129
- useParams,
130
- useResolvedPath,
131
- useRevalidator,
132
- useRouteError,
133
- useRouteLoaderData,
134
- useRoutes,
135
- useSearchParams,
136
- useSubmit
23
+ useRouteLoaderData
137
24
  };
package/dist/esm-node/router/runtime/plugin.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import { jsx as _jsx } from "react/jsx-runtime";
2
2
  import { useContext, useMemo } from "react";
3
- import { createBrowserRouter, createHashRouter, RouterProvider, createRoutesFromElements, useMatches, useLocation } from "@modern-js/runtime-utils/router";
3
+ import { createBrowserRouter, createHashRouter, RouterProvider, createRoutesFromElements, useMatches, useLocation, useHref } from "@modern-js/runtime-utils/router";
4
4
  import hoistNonReactStatics from "hoist-non-react-statics";
5
5
  import { parsedJSONFromElement } from "@modern-js/runtime-utils/parsed";
6
6
  import { RuntimeReactContext } from "../../core";
@@ -34,7 +34,8 @@ const routerPlugin = ({ serverBase = [], supportHtml5History = true, basename =
34
34
  init({ context }, next) {
35
35
  context.router = {
36
36
  useMatches,
37
- useLocation
37
+ useLocation,
38
+ useHref
38
39
  };
39
40
  Object.defineProperty(context, "routes", {
40
41
  get() {
package/dist/types/router/runtime/index.d.ts CHANGED
@@ -1,6 +1,7 @@
1
1
  import { useRouteLoaderData as useRouteData } from '@modern-js/runtime-utils/router';
2
2
  import { routerPlugin } from './plugin';
3
3
  import type { SingleRouteConfig, RouterConfig } from './types';
4
+ export * from '@modern-js/runtime-utils/router';
4
5
  export type { SingleRouteConfig, RouterConfig };
5
6
  export { renderRoutes } from './utils';
6
7
  export default routerPlugin;
@@ -11,5 +12,3 @@ export type { LinkProps, NavLinkProps } from './PrefetchLink';
11
12
  export declare const useRouteLoaderData: typeof useRouteData;
12
13
  export { createShouldRevalidate, handleRouteModule, handleRouteModuleError, } from './routeModule';
13
14
  export type { LoaderFunction, LoaderFunctionArgs } from './types';
14
- 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';
15
- 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 CHANGED
@@ -15,7 +15,7 @@
15
15
  "modern",
16
16
  "modern.js"
17
17
  ],
18
- "version": "2.46.0",
18
+ "version": "2.47.0",
19
19
  "engines": {
20
20
  "node": ">=14.17.6"
21
21
  },
@@ -171,10 +171,10 @@
171
171
  "react-side-effect": "^2.1.1",
172
172
  "styled-components": "^5.3.1",
173
173
  "@swc/helpers": "0.5.3",
174
- "@modern-js/plugin": "2.46.0",
175
- "@modern-js/types": "2.46.0",
176
- "@modern-js/runtime-utils": "2.46.0",
177
- "@modern-js/utils": "2.46.0"
174
+ "@modern-js/utils": "2.47.0",
175
+ "@modern-js/plugin": "2.47.0",
176
+ "@modern-js/types": "2.47.0",
177
+ "@modern-js/runtime-utils": "2.47.0"
178
178
  },
179
179
  "peerDependencies": {
180
180
  "react": ">=17",
@@ -195,11 +195,11 @@
195
195
  "ts-jest": "^29.1.0",
196
196
  "typescript": "^5",
197
197
  "webpack": "^5.89.0",
198
- "@modern-js/app-tools": "2.46.0",
199
- "@modern-js/core": "2.46.0",
200
- "@scripts/build": "2.46.0",
201
- "@scripts/jest-config": "2.46.0",
202
- "@modern-js/server-core": "2.46.0"
198
+ "@modern-js/app-tools": "2.47.0",
199
+ "@modern-js/server-core": "2.47.0",
200
+ "@modern-js/core": "2.47.0",
201
+ "@scripts/build": "2.47.0",
202
+ "@scripts/jest-config": "2.47.0"
203
203
  },
204
204
  "sideEffects": false,
205
205
  "publishConfig": {