@modern-js/runtime 2.31.2 → 2.32.0

package/CHANGELOG.md

@@ -1,5 +1,34 @@
 # @modern-js/runtime
 
+## 2.32.0
+
+### Minor Changes
+
+- a030aff: feat: support loader context
+  feat: 支持 loader context
+
+### Patch Changes
+
+- e5a3fb4: fix: integration test, and export LoaderContext from utils
+  fix: 集成测试，然后导出 LoaderContext
+- 6076166: fix: packaging errors found by publint
+
+  fix: 修复 publint 检测到的 packaging 问题
+
+- 92591c6: fix: component Style render error content
+  fix: component Style 渲染了错误的内容
+- 5255eba: feat: report time for server loader
+  feat: 上报 server loader 执行的时间
+- Updated dependencies [e5a3fb4]
+- Updated dependencies [6076166]
+- Updated dependencies [a030aff]
+- Updated dependencies [4323e68]
+- Updated dependencies [3c91100]
+- Updated dependencies [5255eba]
+  - @modern-js/utils@2.32.0
+  - @modern-js/plugin@2.32.0
+  - @modern-js/types@2.32.0
+
 ## 2.31.2
 
 ### Patch Changes

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Modern.js
+Copyright (c) 2021-present Modern.js
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/cjs/document/Style.js

@@ -15,11 +15,11 @@ const _constants = require("./constants");
 function Style(props) {
   const { content, children } = props;
   const contentStr = children || content;
-  const contentIIFE = encodeURIComponent(`(${contentStr})()`);
+  const styleContent = encodeURIComponent(`${contentStr}`);
   return /* @__PURE__ */ (0, _jsxruntime.jsxs)(_jsxruntime.Fragment, {
     children: [
       `${_constants.DOCUMENT_STYLE_PLACEHOLDER_START}`,
-      `${contentIIFE}`,
+      `${styleContent}`,
       `${_constants.DOCUMENT_STYLE_PLACEHOLDER_END}`
     ]
   });

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

@@ -28,6 +28,9 @@ const _remixrouter = require("@modern-js/utils/runtime/remix-router");
 const _router = require("@modern-js/utils/runtime-node/router");
 const _hoistnonreactstatics = /* @__PURE__ */ _interop_require_default._(require("hoist-non-react-statics"));
 const _router1 = require("@modern-js/utils/runtime/router");
+const _runtimenode = require("@modern-js/utils/runtime-node");
+const _time = require("@modern-js/utils/universal/time");
+const _constants = require("@modern-js/utils/universal/constants");
 const _core = require("../../core");
 const _utils = require("./utils");
 const _fetch = require("./fetch");
@@ -76,12 +79,16 @@ const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
           const { request, mode: ssrMode, nonce } = context.ssrContext;
           const baseUrl = request.baseUrl;
           const _basename = baseUrl === "/" ? (0, _utils.urlJoin)(baseUrl, basename) : baseUrl;
+          const { reporter, serverTiming } = context.ssrContext;
+          const requestContext = (0, _runtimenode.createRequestContext)();
+          requestContext.set(_runtimenode.reporterCtx, reporter);
           let routes = createRoutes ? createRoutes() : (0, _router1.createRoutesFromElements)((0, _utils.renderRoutes)({
             routesConfig,
             ssrMode,
             props: {
               nonce
-            }
+            },
+            reporter
           }));
           const runner = api.useHookRunners();
           routes = runner.modifyRoutes(routes);
@@ -89,7 +96,13 @@ const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
             basename: _basename
           });
           const remixRequest = createFetchRequest(request);
-          const routerContext = await query(remixRequest);
+          const end = (0, _time.time)();
+          const routerContext = await query(remixRequest, {
+            requestContext
+          });
+          const cost = end();
+          reporter.reportTiming(_constants.LOADER_REPORTER_NAME, cost);
+          serverTiming.addServeTiming(_constants.LOADER_REPORTER_NAME, cost);
           if (routerContext instanceof Response) {
             return routerContext;
           }

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

@@ -40,7 +40,7 @@ const _remixrouter = require("@modern-js/utils/runtime/remix-router");
 const _nestedroutes = require("@modern-js/utils/runtime/nested-routes");
 const _DefaultNotFound = require("./DefaultNotFound");
 const _DeferredDataScripts = /* @__PURE__ */ _interop_require_default._(require("./DeferredDataScripts"));
-function getRouteComponents(routes, { globalApp, ssrMode, props }) {
+function getRouteComponents(routes, { globalApp, ssrMode, props, reporter }) {
   const Layout = ({ Component, ...props2 }) => {
     const GlobalLayout = globalApp;
     if (!GlobalLayout) {
@@ -58,7 +58,8 @@ function getRouteComponents(routes, { globalApp, ssrMode, props }) {
     if (route.type === "nested") {
       const routeElement = (0, _nestedroutes.renderNestedRoute)(route, {
         DeferredDataComponent: ssrMode === "stream" ? _DeferredDataScripts.default : void 0,
-        props
+        props,
+        reporter
       });
       routeElements.push(routeElement);
     } else {
@@ -77,7 +78,7 @@ function getRouteComponents(routes, { globalApp, ssrMode, props }) {
   }, "*"));
   return routeElements;
 }
-function renderRoutes({ routesConfig, props, ssrMode }) {
+function renderRoutes({ routesConfig, props, ssrMode, reporter }) {
   if (!routesConfig) {
     return null;
   }
@@ -88,7 +89,8 @@ function renderRoutes({ routesConfig, props, ssrMode }) {
   const routeElements = getRouteComponents(routes, {
     globalApp,
     ssrMode,
-    props
+    props,
+    reporter
   });
   return routeElements;
 }

package/dist/esm/document/Style.js

@@ -3,11 +3,11 @@ import { DOCUMENT_STYLE_PLACEHOLDER_START, DOCUMENT_STYLE_PLACEHOLDER_END } from
 export function Style(props) {
   var content = props.content, children = props.children;
   var contentStr = children || content;
-  var contentIIFE = encodeURIComponent("(".concat(contentStr, ")()"));
+  var styleContent = encodeURIComponent("".concat(contentStr));
   return /* @__PURE__ */ _jsxs(_Fragment, {
     children: [
       "".concat(DOCUMENT_STYLE_PLACEHOLDER_START),
-      "".concat(contentIIFE),
+      "".concat(styleContent),
       "".concat(DOCUMENT_STYLE_PLACEHOLDER_END)
     ]
   });

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

@@ -10,6 +10,9 @@ import { createStaticHandler } from "@modern-js/utils/runtime/remix-router";
 import { createStaticRouter, StaticRouterProvider } from "@modern-js/utils/runtime-node/router";
 import hoistNonReactStatics from "hoist-non-react-statics";
 import { createRoutesFromElements } from "@modern-js/utils/runtime/router";
+import { createRequestContext, reporterCtx } from "@modern-js/utils/runtime-node";
+import { time } from "@modern-js/utils/universal/time";
+import { LOADER_REPORTER_NAME } from "@modern-js/utils/universal/constants";
 import { RuntimeReactContext } from "../../core";
 import { renderRoutes, urlJoin } from "./utils";
 import { installGlobals } from "./fetch";
@@ -87,7 +90,7 @@ export var routerPlugin = function(param) {
         init: function init(param2, next) {
           var context = param2.context;
           return _async_to_generator(function() {
-            var _context_ssrContext, request, ssrMode, nonce, baseUrl, _basename, routes, runner, query, remixRequest, routerContext, router;
+            var _context_ssrContext, request, ssrMode, nonce, baseUrl, _basename, _context_ssrContext1, reporter, serverTiming, requestContext, routes, runner, query, remixRequest, end, routerContext, cost, router;
             return _ts_generator(this, function(_state) {
               switch (_state.label) {
                 case 0:
@@ -102,12 +105,16 @@ export var routerPlugin = function(param) {
                   _context_ssrContext = context.ssrContext, request = _context_ssrContext.request, ssrMode = _context_ssrContext.mode, nonce = _context_ssrContext.nonce;
                   baseUrl = request.baseUrl;
                   _basename = baseUrl === "/" ? urlJoin(baseUrl, basename) : baseUrl;
+                  _context_ssrContext1 = context.ssrContext, reporter = _context_ssrContext1.reporter, serverTiming = _context_ssrContext1.serverTiming;
+                  requestContext = createRequestContext();
+                  requestContext.set(reporterCtx, reporter);
                   routes = createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes({
                     routesConfig: routesConfig,
                     ssrMode: ssrMode,
                     props: {
                       nonce: nonce
-                    }
+                    },
+                    reporter: reporter
                   }));
                   runner = api.useHookRunners();
                   routes = runner.modifyRoutes(routes);
@@ -115,12 +122,18 @@ export var routerPlugin = function(param) {
                     basename: _basename
                   }).query;
                   remixRequest = createFetchRequest(request);
+                  end = time();
                   return [
                     4,
-                    query(remixRequest)
+                    query(remixRequest, {
+                      requestContext: requestContext
+                    })
                   ];
                 case 1:
                   routerContext = _state.sent();
+                  cost = end();
+                  reporter.reportTiming(LOADER_REPORTER_NAME, cost);
+                  serverTiming.addServeTiming(LOADER_REPORTER_NAME, cost);
                   if (_instanceof(routerContext, Response)) {
                     return [
                       2,

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

@@ -10,7 +10,7 @@ import { renderNestedRoute } from "@modern-js/utils/runtime/nested-routes";
 import { DefaultNotFound } from "./DefaultNotFound";
 import DeferredDataScripts from "./DeferredDataScripts";
 export function getRouteComponents(routes, param) {
-  var globalApp = param.globalApp, ssrMode = param.ssrMode, props = param.props;
+  var globalApp = param.globalApp, ssrMode = param.ssrMode, props = param.props, reporter = param.reporter;
   var Layout = function(_param) {
     var Component = _param.Component, props2 = _object_without_properties(_param, [
       "Component"
@@ -31,7 +31,8 @@ export function getRouteComponents(routes, param) {
       if (route.type === "nested") {
         var routeElement = renderNestedRoute(route, {
           DeferredDataComponent: ssrMode === "stream" ? DeferredDataScripts : void 0,
-          props: props
+          props: props,
+          reporter: reporter
         });
         routeElements.push(routeElement);
       } else {
@@ -65,7 +66,7 @@ export function getRouteComponents(routes, param) {
   return routeElements;
 }
 export function renderRoutes(param) {
-  var routesConfig = param.routesConfig, props = param.props, ssrMode = param.ssrMode;
+  var routesConfig = param.routesConfig, props = param.props, ssrMode = param.ssrMode, reporter = param.reporter;
   if (!routesConfig) {
     return null;
   }
@@ -76,7 +77,8 @@ export function renderRoutes(param) {
   var routeElements = getRouteComponents(routes, {
     globalApp: globalApp,
     ssrMode: ssrMode,
-    props: props
+    props: props,
+    reporter: reporter
   });
   return routeElements;
 }

package/dist/esm-node/document/Style.js

@@ -3,11 +3,11 @@ import { DOCUMENT_STYLE_PLACEHOLDER_START, DOCUMENT_STYLE_PLACEHOLDER_END } from
 export function Style(props) {
   const { content, children } = props;
   const contentStr = children || content;
-  const contentIIFE = encodeURIComponent(`(${contentStr})()`);
+  const styleContent = encodeURIComponent(`${contentStr}`);
   return /* @__PURE__ */ _jsxs(_Fragment, {
     children: [
       `${DOCUMENT_STYLE_PLACEHOLDER_START}`,
-      `${contentIIFE}`,
+      `${styleContent}`,
       `${DOCUMENT_STYLE_PLACEHOLDER_END}`
     ]
   });

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

@@ -4,6 +4,9 @@ import { createStaticHandler } from "@modern-js/utils/runtime/remix-router";
 import { createStaticRouter, StaticRouterProvider } from "@modern-js/utils/runtime-node/router";
 import hoistNonReactStatics from "hoist-non-react-statics";
 import { createRoutesFromElements } from "@modern-js/utils/runtime/router";
+import { createRequestContext, reporterCtx } from "@modern-js/utils/runtime-node";
+import { time } from "@modern-js/utils/universal/time";
+import { LOADER_REPORTER_NAME } from "@modern-js/utils/universal/constants";
 import { RuntimeReactContext } from "../../core";
 import { renderRoutes, urlJoin } from "./utils";
 import { installGlobals } from "./fetch";
@@ -52,12 +55,16 @@ export const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
           const { request, mode: ssrMode, nonce } = context.ssrContext;
           const baseUrl = request.baseUrl;
           const _basename = baseUrl === "/" ? urlJoin(baseUrl, basename) : baseUrl;
+          const { reporter, serverTiming } = context.ssrContext;
+          const requestContext = createRequestContext();
+          requestContext.set(reporterCtx, reporter);
           let routes = createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes({
             routesConfig,
             ssrMode,
             props: {
               nonce
-            }
+            },
+            reporter
           }));
           const runner = api.useHookRunners();
           routes = runner.modifyRoutes(routes);
@@ -65,7 +72,13 @@ export const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
             basename: _basename
           });
           const remixRequest = createFetchRequest(request);
-          const routerContext = await query(remixRequest);
+          const end = time();
+          const routerContext = await query(remixRequest, {
+            requestContext
+          });
+          const cost = end();
+          reporter.reportTiming(LOADER_REPORTER_NAME, cost);
+          serverTiming.addServeTiming(LOADER_REPORTER_NAME, cost);
           if (routerContext instanceof Response) {
             return routerContext;
           }

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

@@ -4,7 +4,7 @@ import { ErrorResponse } from "@modern-js/utils/runtime/remix-router";
 import { renderNestedRoute } from "@modern-js/utils/runtime/nested-routes";
 import { DefaultNotFound } from "./DefaultNotFound";
 import DeferredDataScripts from "./DeferredDataScripts";
-export function getRouteComponents(routes, { globalApp, ssrMode, props }) {
+export function getRouteComponents(routes, { globalApp, ssrMode, props, reporter }) {
   const Layout = ({ Component, ...props2 }) => {
     const GlobalLayout = globalApp;
     if (!GlobalLayout) {
@@ -22,7 +22,8 @@ export function getRouteComponents(routes, { globalApp, ssrMode, props }) {
     if (route.type === "nested") {
       const routeElement = renderNestedRoute(route, {
         DeferredDataComponent: ssrMode === "stream" ? DeferredDataScripts : void 0,
-        props
+        props,
+        reporter
       });
       routeElements.push(routeElement);
     } else {
@@ -41,7 +42,7 @@ export function getRouteComponents(routes, { globalApp, ssrMode, props }) {
   }, "*"));
   return routeElements;
 }
-export function renderRoutes({ routesConfig, props, ssrMode }) {
+export function renderRoutes({ routesConfig, props, ssrMode, reporter }) {
   if (!routesConfig) {
     return null;
   }
@@ -52,7 +53,8 @@ export function renderRoutes({ routesConfig, props, ssrMode }) {
   const routeElements = getRouteComponents(routes, {
     globalApp,
     ssrMode,
-    props
+    props,
+    reporter
   });
   return routeElements;
 }

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/dist/types/router/runtime/utils.d.ts

@@ -1,24 +1,28 @@
 import React from 'react';
-import { type NestedRoute, type PageRoute, type SSRMode } from '@modern-js/types';
+import type { Reporter, NestedRoute, PageRoute, SSRMode } from '@modern-js/types';
 import { type StaticHandlerContext, type Router } from '@modern-js/utils/runtime/remix-router';
 import { RouterConfig } from './types';
 export declare function getRouteComponents(routes: (NestedRoute | PageRoute)[], {
   globalApp,
   ssrMode,
-  props
+  props,
+  reporter
 }: {
   globalApp?: React.ComponentType<any>;
   ssrMode?: SSRMode;
   props?: Record<string, any>;
+  reporter?: Reporter;
 }): React.ReactElement<any, string | React.JSXElementConstructor<any>>[];
 export declare function renderRoutes({
   routesConfig,
   props,
-  ssrMode
+  ssrMode,
+  reporter
 }: {
   routesConfig: RouterConfig['routesConfig'];
   props?: Record<string, any>;
   ssrMode?: SSRMode;
+  reporter?: Reporter;
 }): React.ReactElement<any, string | React.JSXElementConstructor<any>>[] | null;
 export declare function getLocation(serverContext: any): string;
 export declare const urlJoin: (...parts: string[]) => string;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.31.2",
+  "version": "2.32.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.2",
-    "@modern-js/types": "2.31.2",
-    "@modern-js/utils": "2.31.2"
+    "@modern-js/plugin": "2.32.0",
+    "@modern-js/types": "2.32.0",
+    "@modern-js/utils": "2.32.0"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -196,11 +196,11 @@
     "ts-jest": "^29.1.0",
     "typescript": "^5",
     "webpack": "^5.88.1",
-    "@modern-js/app-tools": "2.31.2",
-    "@modern-js/core": "2.31.2",
-    "@modern-js/server-core": "2.31.2",
-    "@scripts/build": "2.31.1",
-    "@scripts/jest-config": "2.31.1"
+    "@modern-js/app-tools": "2.32.0",
+    "@modern-js/core": "2.32.0",
+    "@modern-js/server-core": "2.32.0",
+    "@scripts/jest-config": "2.32.0",
+    "@scripts/build": "2.32.0"
   },
   "sideEffects": false,
   "publishConfig": {