@modern-js/runtime 2.31.1 → 2.31.3-alpha.0

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

@@ -8,5 +8,6 @@ export * from './withRouter';
 export { Link, NavLink } from './PrefetchLink';
 export type { LinkProps, NavLinkProps } from './PrefetchLink';
 export declare const useRouteLoaderData: typeof useRouteData;
-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, LoaderFunction, LoaderFunctionArgs, 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/utils/runtime/router';
+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/utils/runtime/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/utils/runtime/router';

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

@@ -1,6 +1,7 @@
 /// <reference types="react" />
-import type { RouteProps, RouteObject } from '@modern-js/utils/runtime/router';
+import type { RouteProps, RouteObject, Params } from '@modern-js/utils/runtime/router';
 import { PageRoute, NestedRoute } from '@modern-js/types';
+import type { RequestContext } from '@modern-js/utils/runtime-node';
 declare global {
   interface Window {
     _SERVER_DATA?: {
@@ -48,4 +49,13 @@ export interface RouteAssets {
     chunkIds?: (string | number)[];
     assets?: string[];
   };
-}
+}
+interface DataFunctionArgs<D = any> {
+  request: Request;
+  params: Params;
+  context?: D;
+}
+export type LoaderFunctionArgs = DataFunctionArgs<RequestContext>;
+declare type DataFunctionValue = Response | NonNullable<unknown> | null;
+export type LoaderFunction = (args: LoaderFunctionArgs) => Promise<DataFunctionValue> | DataFunctionValue;
+export {};

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.31.1",
+  "version": "2.31.3-alpha.0",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -25,8 +25,8 @@
   "module": "./dist/esm/index.js",
   "exports": {
     ".": {
-      "jsnext:source": "./src/index.ts",
       "types": "./dist/types/index.d.ts",
+      "jsnext:source": "./src/index.ts",
       "default": "./dist/esm/index.js"
     },
     "./types": "./types/index.d.ts",
@@ -34,68 +34,68 @@
     "./types/router": "./types/router.d.ts",
     "./types/model": "./types/model.d.ts",
     "./loadable": {
-      "jsnext:source": "./src/exports/loadable.ts",
       "types": "./dist/types/exports/loadable.d.ts",
+      "jsnext:source": "./src/exports/loadable.ts",
       "default": "./dist/esm/exports/loadable.js"
     },
     "./head": {
-      "jsnext:source": "./src/exports/head.ts",
       "types": "./dist/types/exports/head.d.ts",
+      "jsnext:source": "./src/exports/head.ts",
       "default": "./dist/esm/exports/head.js"
     },
     "./styled": {
-      "jsnext:source": "./src/exports/styled.ts",
       "types": "./dist/types/exports/styled.d.ts",
+      "jsnext:source": "./src/exports/styled.ts",
       "default": "./dist/esm/exports/styled.js"
     },
     "./server": {
+      "types": "./dist/types/exports/server.d.ts",
       "jsnext:source": "./src/exports/server.ts",
       "node": "./dist/cjs/exports/server.js",
-      "types": "./dist/types/exports/server.d.ts",
       "default": "./dist/esm/exports/server.js"
     },
     "./document": {
+      "types": "./dist/types/document/index.d.ts",
       "jsnext:source": "./src/document/index.ts",
       "node": "./dist/cjs/document/index.js",
-      "types": "./dist/types/document/index.d.ts",
       "default": "./dist/esm/document/index.js"
     },
     "./document/cli": {
+      "types": "./dist/types/document/index.d.ts",
       "jsnext:source": "./src/document/cli/index.ts",
       "node": "./dist/cjs/document/cli/index.js",
-      "types": "./dist/types/document/index.d.ts",
       "default": "./dist/esm/document/cli/index.js"
     },
     "./ssr": {
+      "types": "./dist/types/ssr/index.d.ts",
       "jsnext:source": "./src/ssr/index.ts",
       "node": "./dist/esm/ssr/index.node.js",
       "worker": "./dist/esm/ssr/index.node.js",
-      "types": "./dist/types/ssr/index.d.ts",
       "default": "./dist/esm/ssr/index.js"
     },
     "./model": {
-      "jsnext:source": "./src/state/index.ts",
       "types": "./types/model.d.ts",
+      "jsnext:source": "./src/state/index.ts",
       "default": "./dist/esm/state/index.js"
     },
     "./cli": {
-      "jsnext:source": "./src/cli/index.ts",
       "types": "./dist/types/cli/index.d.ts",
+      "jsnext:source": "./src/cli/index.ts",
       "default": "./dist/cjs/cli/index.js"
     },
     "./router": {
-      "jsnext:source": "./src/router/index.ts",
       "types": "./dist/types/router/index.d.ts",
+      "jsnext:source": "./src/router/index.ts",
       "default": "./dist/esm/router/index.js"
     },
     "./router/server": {
-      "jsnext:source": "./src/router/runtime/server.ts",
       "types": "./dist/types/router/runtime/server.d.ts",
+      "jsnext:source": "./src/router/runtime/server.ts",
       "default": "./dist/esm/router/runtime/server.js"
     },
     "./loadable-bundler-plugin": {
-      "jsnext:source": "./src/ssr/cli/loadable-bundler-plugin.ts",
       "types": "./dist/types/ssr/cli/loadable-bundler-plugin.d.ts",
+      "jsnext:source": "./src/ssr/cli/loadable-bundler-plugin.ts",
       "default": "./dist/cjs/ssr/cli/loadable-bundler-plugin.js"
     }
   },
@@ -173,9 +173,9 @@
     "redux-logger": "^3.0.6",
     "styled-components": "^5.3.1",
     "@swc/helpers": "0.5.1",
-    "@modern-js/plugin": "2.31.1",
-    "@modern-js/types": "2.31.1",
-    "@modern-js/utils": "2.31.1"
+    "@modern-js/plugin": "2.31.2",
+    "@modern-js/utils": "2.31.2",
+    "@modern-js/types": "2.31.2"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -196,11 +196,11 @@
     "ts-jest": "^29.1.0",
     "typescript": "^5",
     "webpack": "^5.88.1",
-    "@modern-js/app-tools": "2.31.1",
-    "@modern-js/core": "2.31.1",
-    "@modern-js/server-core": "2.31.1",
+    "@modern-js/app-tools": "2.31.2",
+    "@modern-js/server-core": "2.31.2",
     "@scripts/build": "2.31.1",
-    "@scripts/jest-config": "2.31.1"
+    "@scripts/jest-config": "2.31.1",
+    "@modern-js/core": "2.31.2"
   },
   "sideEffects": false,
   "publishConfig": {