@modern-js/runtime 2.35.0 → 2.36.0

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

@@ -1,6 +1,6 @@
 import { jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { DOCUMENT_SCRIPT_PLACEHOLDER_START, DOCUMENT_SCRIPT_PLACEHOLDER_END } from "./constants";
-export function Script(props) {
+function Script(props) {
   const { content } = props;
   const contentStr = content.toString();
   const contentIIFE = encodeURIComponent(`(${contentStr})()`);
@@ -12,3 +12,6 @@ export function Script(props) {
     ]
   });
 }
+export {
+  Script
+};

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

@@ -1,7 +1,10 @@
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import { DOCUMENT_SCRIPTS_PLACEHOLDER } from "./constants";
-export function Scripts() {
+function Scripts() {
   return /* @__PURE__ */ _jsx(_Fragment, {
     children: `${DOCUMENT_SCRIPTS_PLACEHOLDER}`
   });
 }
+export {
+  Scripts
+};

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

@@ -1,6 +1,6 @@
 import { jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { DOCUMENT_STYLE_PLACEHOLDER_START, DOCUMENT_STYLE_PLACEHOLDER_END } from "./constants";
-export function Style(props) {
+function Style(props) {
   const { content, children } = props;
   const contentStr = children || content;
   const styleContent = encodeURIComponent(`${contentStr}`);
@@ -12,3 +12,6 @@ export function Style(props) {
     ]
   });
 }
+export {
+  Style
+};

package/dist/esm-node/document/cli/index.js

@@ -6,7 +6,7 @@ import { createDebugger, findExists, fs } from "@modern-js/utils";
 import { DocumentContext } from "../DocumentContext";
 import { DOCUMENT_SCRIPTS_PLACEHOLDER, DOCUMENT_LINKS_PLACEHOLDER, DOCUMENT_FILE_NAME, DOCUMENT_META_PLACEHOLDER, PLACEHOLDER_REPLACER_MAP, DOC_EXT, DOCUMENT_SSR_PLACEHOLDER, DOCUMENT_CHUNKSMAP_PLACEHOLDER, DOCUMENT_SSRDATASCRIPT_PLACEHOLDER, DOCUMENT_SCRIPT_PLACEHOLDER_START, DOCUMENT_SCRIPT_PLACEHOLDER_END, HTML_SEPARATOR, DOCUMENT_COMMENT_PLACEHOLDER_START, DOCUMENT_COMMENT_PLACEHOLDER_END, DOCUMENT_STYLE_PLACEHOLDER_START, DOCUMENT_STYLE_PLACEHOLDER_END, TOP_PARTICALS_SEPARATOR, HEAD_PARTICALS_SEPARATOR, BODY_PARTICALS_SEPARATOR } from "../constants";
 const debug = createDebugger("html_genarate");
-export const getDocumenByEntryName = function(entrypoints, entryName, fallbackDir) {
+const getDocumenByEntryName = function(entrypoints, entryName, fallbackDir) {
   var _entrypoints_find;
   const entryDir = (_entrypoints_find = entrypoints.find((item) => item.entryName === entryName)) === null || _entrypoints_find === void 0 ? void 0 : _entrypoints_find.absoluteEntryDir;
   const entryDirs = DOC_EXT.map((item) => `${entryDir}${path.sep}${DOCUMENT_FILE_NAME}.${item}`);
@@ -21,7 +21,7 @@ export const getDocumenByEntryName = function(entrypoints, entryName, fallbackDi
   ]);
   return docFile || void 0;
 };
-export const documentPlugin = () => ({
+const documentPlugin = () => ({
   name: "@modern-js/plugin-document",
   pre: [
     "@modern-js/plugin-analyze"
@@ -45,7 +45,6 @@ export const documentPlugin = () => ({
         return null;
       }
       return async ({ htmlWebpackPlugin }) => {
-        var _tsConfig, _partialsByEntrypoint;
         const config = api.useResolvedConfigContext();
         const documentParams = getDocParams({
           config,
@@ -60,7 +59,7 @@ export const documentPlugin = () => ({
         } catch (err) {
           tsConfig = {};
         }
-        if ((_tsConfig = tsConfig) === null || _tsConfig === void 0 ? void 0 : _tsConfig.compilerOptions) {
+        if (tsConfig === null || tsConfig === void 0 ? void 0 : tsConfig.compilerOptions) {
           tsConfig.compilerOptions.jsx = "react-jsx";
         } else {
           tsConfig.compilerOptions = {
@@ -120,7 +119,7 @@ export const documentPlugin = () => ({
           partialsHead: "",
           partialsBody: ""
         };
-        if ((_partialsByEntrypoint = partialsByEntrypoint) === null || _partialsByEntrypoint === void 0 ? void 0 : _partialsByEntrypoint[entryName]) {
+        if (partialsByEntrypoint === null || partialsByEntrypoint === void 0 ? void 0 : partialsByEntrypoint[entryName]) {
           partialsContent.partialsTop = partialsByEntrypoint[entryName].top.join("\n");
           partialsContent.partialsHead = partialsByEntrypoint[entryName].head.join("\n");
           partialsContent.partialsBody = partialsByEntrypoint[entryName].body.join("\n");
@@ -153,9 +152,8 @@ export const documentPlugin = () => ({
         return {
           tools: {
             htmlPlugin: (options, entry) => {
-              var _options, _options1, _options2;
-              const hackParameters = typeof ((_options = options) === null || _options === void 0 ? void 0 : _options.templateParameters) === "function" ? (_options1 = options) === null || _options1 === void 0 ? void 0 : _options1.templateParameters({}, {}, {}, {}) : {
-                ...(_options2 = options) === null || _options2 === void 0 ? void 0 : _options2.templateParameters
+              const hackParameters = typeof (options === null || options === void 0 ? void 0 : options.templateParameters) === "function" ? options === null || options === void 0 ? void 0 : options.templateParameters({}, {}, {}, {}) : {
+                ...options === null || options === void 0 ? void 0 : options.templateParameters
               };
               const templateContent = documentEntry(
                 entry.entryName,
@@ -178,4 +176,9 @@ export const documentPlugin = () => ({
     };
   }
 });
-export default documentPlugin;
+var cli_default = documentPlugin;
+export {
+  cli_default as default,
+  documentPlugin,
+  getDocumenByEntryName
+};

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

@@ -1,30 +1,52 @@
 import { HTML_CHUNKSMAP_SEPARATOR } from "@modern-js/utils/universal/constants";
-export const DOC_EXT = [
+const DOC_EXT = [
   "jsx",
   "tsx",
   "ts",
   "js"
 ];
-export const DOCUMENT_META_PLACEHOLDER = encodeURIComponent("<%= meta %>");
-export const HTML_SEPARATOR = "<!--<?- html ?>-->";
-export const HEAD_PARTICALS_SEPARATOR = encodeURIComponent("<!--<?- partials.head ?>-->");
-export const BODY_PARTICALS_SEPARATOR = encodeURIComponent("<!--<?- partials.body ?>-->");
-export const TOP_PARTICALS_SEPARATOR = encodeURIComponent("<!--<?- partials.top ?>-->");
-export const HTML_SSRDATASCRIPT_SEPARATOR = "<!--<?- SSRDataScript ?>-->";
-export const DOCUMENT_SSR_PLACEHOLDER = encodeURIComponent(HTML_SEPARATOR);
-export const DOCUMENT_CHUNKSMAP_PLACEHOLDER = encodeURIComponent(HTML_CHUNKSMAP_SEPARATOR);
-export const DOCUMENT_SSRDATASCRIPT_PLACEHOLDER = encodeURIComponent(HTML_SSRDATASCRIPT_SEPARATOR);
-export const DOCUMENT_FILE_NAME = "Document";
-export const DOCUMENT_SCRIPTS_PLACEHOLDER = encodeURIComponent("<!-- chunk scripts placeholder -->");
-export const DOCUMENT_LINKS_PLACEHOLDER = encodeURIComponent("<!-- chunk links placeholder -->");
-export const DOCUMENT_SCRIPT_PLACEHOLDER_START = encodeURIComponent("<!-- script-start -->");
-export const DOCUMENT_SCRIPT_PLACEHOLDER_END = encodeURIComponent("<!-- script-end -->");
-export const DOCUMENT_STYLE_PLACEHOLDER_START = encodeURIComponent("<!-- style-start -->");
-export const DOCUMENT_STYLE_PLACEHOLDER_END = encodeURIComponent("<!-- style-end -->");
-export const DOCUMENT_COMMENT_PLACEHOLDER_START = encodeURIComponent("<!-- comment-start -->");
-export const DOCUMENT_COMMENT_PLACEHOLDER_END = encodeURIComponent("<!-- comment-end -->");
-export const PLACEHOLDER_REPLACER_MAP = {
+const DOCUMENT_META_PLACEHOLDER = encodeURIComponent("<%= meta %>");
+const HTML_SEPARATOR = "<!--<?- html ?>-->";
+const HEAD_PARTICALS_SEPARATOR = encodeURIComponent("<!--<?- partials.head ?>-->");
+const BODY_PARTICALS_SEPARATOR = encodeURIComponent("<!--<?- partials.body ?>-->");
+const TOP_PARTICALS_SEPARATOR = encodeURIComponent("<!--<?- partials.top ?>-->");
+const HTML_SSRDATASCRIPT_SEPARATOR = "<!--<?- SSRDataScript ?>-->";
+const DOCUMENT_SSR_PLACEHOLDER = encodeURIComponent(HTML_SEPARATOR);
+const DOCUMENT_CHUNKSMAP_PLACEHOLDER = encodeURIComponent(HTML_CHUNKSMAP_SEPARATOR);
+const DOCUMENT_SSRDATASCRIPT_PLACEHOLDER = encodeURIComponent(HTML_SSRDATASCRIPT_SEPARATOR);
+const DOCUMENT_FILE_NAME = "Document";
+const DOCUMENT_SCRIPTS_PLACEHOLDER = encodeURIComponent("<!-- chunk scripts placeholder -->");
+const DOCUMENT_LINKS_PLACEHOLDER = encodeURIComponent("<!-- chunk links placeholder -->");
+const DOCUMENT_SCRIPT_PLACEHOLDER_START = encodeURIComponent("<!-- script-start -->");
+const DOCUMENT_SCRIPT_PLACEHOLDER_END = encodeURIComponent("<!-- script-end -->");
+const DOCUMENT_STYLE_PLACEHOLDER_START = encodeURIComponent("<!-- style-start -->");
+const DOCUMENT_STYLE_PLACEHOLDER_END = encodeURIComponent("<!-- style-end -->");
+const DOCUMENT_COMMENT_PLACEHOLDER_START = encodeURIComponent("<!-- comment-start -->");
+const DOCUMENT_COMMENT_PLACEHOLDER_END = encodeURIComponent("<!-- comment-end -->");
+const PLACEHOLDER_REPLACER_MAP = {
   [DOCUMENT_SSR_PLACEHOLDER]: HTML_SEPARATOR,
   [DOCUMENT_CHUNKSMAP_PLACEHOLDER]: HTML_CHUNKSMAP_SEPARATOR,
   [DOCUMENT_SSRDATASCRIPT_PLACEHOLDER]: HTML_SSRDATASCRIPT_SEPARATOR
 };
+export {
+  BODY_PARTICALS_SEPARATOR,
+  DOCUMENT_CHUNKSMAP_PLACEHOLDER,
+  DOCUMENT_COMMENT_PLACEHOLDER_END,
+  DOCUMENT_COMMENT_PLACEHOLDER_START,
+  DOCUMENT_FILE_NAME,
+  DOCUMENT_LINKS_PLACEHOLDER,
+  DOCUMENT_META_PLACEHOLDER,
+  DOCUMENT_SCRIPTS_PLACEHOLDER,
+  DOCUMENT_SCRIPT_PLACEHOLDER_END,
+  DOCUMENT_SCRIPT_PLACEHOLDER_START,
+  DOCUMENT_SSRDATASCRIPT_PLACEHOLDER,
+  DOCUMENT_SSR_PLACEHOLDER,
+  DOCUMENT_STYLE_PLACEHOLDER_END,
+  DOCUMENT_STYLE_PLACEHOLDER_START,
+  DOC_EXT,
+  HEAD_PARTICALS_SEPARATOR,
+  HTML_SEPARATOR,
+  HTML_SSRDATASCRIPT_SEPARATOR,
+  PLACEHOLDER_REPLACER_MAP,
+  TOP_PARTICALS_SEPARATOR
+};

package/dist/esm-node/exports/head.js

@@ -1,3 +1,6 @@
 import head from "react-helmet";
-export default head;
+var head_default = head;
 export * from "react-helmet";
+export {
+  head_default as default
+};

package/dist/esm-node/exports/loadable.js

@@ -1,3 +1,6 @@
 import loadable from "@loadable/component";
-export default loadable;
+var loadable_default = loadable;
 export * from "@loadable/component";
+export {
+  loadable_default as default
+};

package/dist/esm-node/exports/server.js

@@ -1 +1,4 @@
-export const hook = (attacher) => attacher;
+const hook = (attacher) => attacher;
+export {
+  hook
+};

package/dist/esm-node/exports/styled.js

@@ -1,3 +1,6 @@
 import styled from "styled-components";
-export default styled;
+var styled_default = styled;
 export * from "styled-components";
+export {
+  styled_default as default
+};

package/dist/esm-node/index.js

@@ -1,2 +1,13 @@
-export { isBrowser } from "./common";
-export { createApp, createPlugin, useLoader, bootstrap, RuntimeReactContext, defineConfig, registerInit, useRuntimeContext } from "./core";
+import { isBrowser } from "./common";
+import { createApp, createPlugin, useLoader, bootstrap, RuntimeReactContext, defineConfig, registerInit, useRuntimeContext } from "./core";
+export {
+  RuntimeReactContext,
+  bootstrap,
+  createApp,
+  createPlugin,
+  defineConfig,
+  isBrowser,
+  registerInit,
+  useLoader,
+  useRuntimeContext
+};

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

@@ -1,7 +1,7 @@
 import { getEntryOptions, createRuntimeExportsUtils, isRouterV5 as isV5 } from "@modern-js/utils";
 const PLUGIN_IDENTIFIER = "router";
 const ROUTES_IDENTIFIER = "routes";
-export const routerPlugin = () => ({
+const routerPlugin = () => ({
   name: "@modern-js/plugin-router",
   required: [
     "@modern-js/runtime"
@@ -43,13 +43,12 @@ export const routerPlugin = () => ({
         ];
       },
       modifyEntryImports({ entrypoint, imports }) {
-        var _runtimeConfig;
         const { entryName, isMainEntry, fileSystemRoutes } = entrypoint;
         const userConfig = api.useResolvedConfigContext();
         const { packageName } = api.useAppContext();
         const runtimeConfig = getEntryOptions(entryName, isMainEntry, userConfig.runtime, userConfig.runtimeByEntries, packageName);
         runtimeConfigMap.set(entryName, runtimeConfig);
-        if ((_runtimeConfig = runtimeConfig) === null || _runtimeConfig === void 0 ? void 0 : _runtimeConfig.router) {
+        if (runtimeConfig === null || runtimeConfig === void 0 ? void 0 : runtimeConfig.router) {
           if (!isV5(userConfig)) {
             imports.push({
               value: "@modern-js/runtime/plugins",
@@ -98,4 +97,8 @@ export const routerPlugin = () => ({
     };
   }
 });
-export default routerPlugin;
+var cli_default = routerPlugin;
+export {
+  cli_default as default,
+  routerPlugin
+};

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

@@ -1,3 +1,7 @@
-export { default as router } from "./runtime";
-export { default } from "./runtime";
+import { default as default2 } from "./runtime";
+import { default as default3 } from "./runtime";
 export * from "./runtime";
+export {
+  default3 as default,
+  default2 as router
+};

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

@@ -1,5 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-export const DefaultNotFound = () => /* @__PURE__ */ _jsx("div", {
+const DefaultNotFound = () => /* @__PURE__ */ _jsx("div", {
   style: {
     margin: "150px auto",
     textAlign: "center",
@@ -9,3 +9,6 @@ export const DefaultNotFound = () => /* @__PURE__ */ _jsx("div", {
   },
   children: "404"
 });
+export {
+  DefaultNotFound
+};

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

@@ -1,3 +1,6 @@
-export default () => {
+var DeferredDataScripts_default = () => {
   return null;
 };
+export {
+  DeferredDataScripts_default as default
+};

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

@@ -1,14 +1,13 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { Suspense, useEffect, useRef, useMemo, useContext } from "react";
-import { Await, UNSAFE_DataRouterContext as DataRouterContext, useAsyncError } from "@modern-js/utils/runtime/router";
-import { serializeJson } from "@modern-js/utils/runtime-node";
+import { Await, UNSAFE_DataRouterContext as DataRouterContext, useAsyncError } from "@modern-js/runtime-utils/router";
+import { serializeJson } from "@modern-js/runtime-utils/node";
 import { JSX_SHELL_STREAM_END_MARK } from "../../common";
 import { serializeErrors } from "./utils";
 const setupFnStr = `function s(r,e){_ROUTER_DATA.r=_ROUTER_DATA.r||{},_ROUTER_DATA.r[r]=_ROUTER_DATA.r[r]||{};return new Promise((function(A,R){_ROUTER_DATA.r[r][e]={resolve:A,reject:R}}))};`;
 const resolveFnStr = `function r(e,r,o,A){A?_ROUTER_DATA.r[e][r].reject(A):_ROUTER_DATA.r[e][r].resolve(o)};`;
 const preResolvedFnStr = `function p(e,r){return void 0!==r?Promise.reject(new Error(r.message)):Promise.resolve(e)};`;
 const DeferredDataScripts = (props) => {
-  var _props;
   const context = useContext(DataRouterContext);
   const { staticContext } = context || {};
   const hydratedRef = useRef(false);
@@ -36,9 +35,8 @@ const DeferredDataScripts = (props) => {
       const { deferredKeys } = deferredData;
       const deferredKeyPromiseStr = deferredKeys.map((key) => {
         if (pendingKeys.has(key)) {
-          var _props2;
           deferredDataScripts.push(/* @__PURE__ */ _jsx(DeferredDataScript, {
-            nonce: (_props2 = props) === null || _props2 === void 0 ? void 0 : _props2.nonce,
+            nonce: props === null || props === void 0 ? void 0 : props.nonce,
             data: deferredData.data[key],
             dataKey: key,
             routeId
@@ -74,7 +72,7 @@ const DeferredDataScripts = (props) => {
     children: [
       !hydratedRef.current && /* @__PURE__ */ _jsx("script", {
         async: true,
-        nonce: (_props = props) === null || _props === void 0 ? void 0 : _props.nonce,
+        nonce: props === null || props === void 0 ? void 0 : props.nonce,
         suppressHydrationWarning: true,
         dangerouslySetInnerHTML: {
           __html: deferredScripts[0]
@@ -118,4 +116,7 @@ const ErrorDeferredDataScript = ({ routeId, dataKey, nonce }) => {
     }
   });
 };
-export default DeferredDataScripts;
+var DeferredDataScripts_node_default = DeferredDataScripts;
+export {
+  DeferredDataScripts_node_default as default
+};

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

@@ -1,11 +1,10 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import React, { useContext, useMemo } from "react";
-import { Link as RouterLink, matchRoutes, useResolvedPath, useHref, useMatches, NavLink as RouterNavLink } from "@modern-js/utils/runtime/router";
+import { Link as RouterLink, matchRoutes, useResolvedPath, useHref, useMatches, NavLink as RouterNavLink } from "@modern-js/runtime-utils/router";
 import { RuntimeReactContext } from "../../core";
-export function composeEventHandlers(theirHandler, ourHandler) {
+function composeEventHandlers(theirHandler, ourHandler) {
   return (event) => {
-    var _theirHandler;
-    (_theirHandler = theirHandler) === null || _theirHandler === void 0 ? void 0 : _theirHandler(event);
+    theirHandler === null || theirHandler === void 0 ? void 0 : theirHandler(event);
     if (!event.defaultPrevented) {
       ourHandler(event);
     }
@@ -71,8 +70,7 @@ async function loadRouteModule(route, routeAssets) {
   }
   try {
     await Promise.all(chunkIds.map((chunkId) => {
-      var __webpack_chunk_load__1;
-      return (__webpack_chunk_load__1 = __webpack_chunk_load__) === null || __webpack_chunk_load__1 === void 0 ? void 0 : __webpack_chunk_load__1(String(chunkId));
+      return __webpack_chunk_load__ === null || __webpack_chunk_load__ === void 0 ? void 0 : __webpack_chunk_load__(String(chunkId));
     }));
   } catch (error) {
     console.error(error);
@@ -106,8 +104,7 @@ const PrefetchPageLinks = ({ pathname }) => {
   const { routeAssets } = routeManifest || {};
   const matches = Array.isArray(routes) ? matchRoutes(routes, pathname) : [];
   if (Array.isArray(matches) && routeAssets) {
-    var _matches;
-    (_matches = matches) === null || _matches === void 0 ? void 0 : _matches.forEach((match) => loadRouteModule(match.route, routeAssets));
+    matches === null || matches === void 0 ? void 0 : matches.forEach((match) => loadRouteModule(match.route, routeAssets));
   }
   if (!window._SSR_DATA) {
     return null;
@@ -122,8 +119,7 @@ const PrefetchDataLinks = ({ matches, pathname, routeManifest }) => {
   const currentMatches = useMatches();
   const basename = useHref("/");
   const dataHrefs = useMemo(() => {
-    var _matches;
-    return (_matches = matches) === null || _matches === void 0 ? void 0 : _matches.filter((match, index) => {
+    return matches === null || matches === void 0 ? void 0 : matches.filter((match, index) => {
       if (!match.route.loader || typeof match.route.loader !== "function" || match.route.loader.length === 0) {
         return false;
       }
@@ -173,4 +169,8 @@ const Link = createPrefetchLink(RouterLink);
 Link.displayName = "Link";
 const NavLink = createPrefetchLink(RouterNavLink);
 NavLink.displayName = "NavLink";
-export { Link, NavLink };
+export {
+  Link,
+  NavLink,
+  composeEventHandlers
+};

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

@@ -1,3 +1,5 @@
 function installGlobals() {
 }
-export { installGlobals };
+export {
+  installGlobals
+};

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

@@ -1,2 +1,4 @@
 import { installGlobals } from "@remix-run/node";
-export { installGlobals };
+export {
+  installGlobals
+};

package/dist/esm-node/router/runtime/fetch.worker.js

@@ -1,3 +1,5 @@
 function installGlobals() {
 }
-export { installGlobals };
+export {
+  installGlobals
+};

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

@@ -1,3 +1,5 @@
 import { createWaterfall } from "@modern-js/plugin";
 const modifyRoutes = createWaterfall();
-export { modifyRoutes };
+export {
+  modifyRoutes
+};

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

@@ -1,15 +1,15 @@
-import { useRouteLoaderData as useRouteData } from "@modern-js/utils/runtime/router";
+import { useRouteLoaderData as useRouteData } from "@modern-js/runtime-utils/router";
 import { routerPlugin } from "./plugin";
-export { renderRoutes } from "./utils";
-export default routerPlugin;
-export { modifyRoutes } from "./plugin";
+import { renderRoutes } from "./utils";
+var runtime_default = routerPlugin;
+import { modifyRoutes } from "./plugin";
 export * from "./withRouter";
-export { Link, NavLink } from "./PrefetchLink";
-export const useRouteLoaderData = (routeId) => {
+import { Link, NavLink } from "./PrefetchLink";
+const useRouteLoaderData = (routeId) => {
   const realRouteId = routeId.replace(/\[(.*?)\]/g, "($1)");
   return useRouteData(realRouteId);
 };
-export {
+import {
   createBrowserRouter,
   createHashRouter,
   createMemoryRouter,
@@ -66,4 +66,68 @@ export {
   defer,
   json,
   redirect
-} from "@modern-js/utils/runtime/router";
+} 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,
+  runtime_default as default,
+  defer,
+  generatePath,
+  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
+};

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

@@ -1,16 +1,16 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useContext, useMemo } from "react";
-import { createBrowserRouter, createHashRouter, RouterProvider, createRoutesFromElements, useMatches, useLocation } from "@modern-js/utils/runtime/router";
+import { createBrowserRouter, createHashRouter, RouterProvider, createRoutesFromElements, useMatches, useLocation } from "@modern-js/runtime-utils/router";
 import hoistNonReactStatics from "hoist-non-react-statics";
-import { parsedJSONFromElement } from "@modern-js/utils/runtime-browser";
+import { parsedJSONFromElement } from "@modern-js/runtime-utils/browser";
 import { RuntimeReactContext } from "../../core";
 import { modifyRoutes as modifyRoutesHook } from "./hooks";
 import { deserializeErrors, renderRoutes, urlJoin } from "./utils";
-export let finalRouteConfig = {
+let finalRouteConfig = {
   routes: []
 };
-export let beforeCreateRouter = true;
-export function modifyRoutes(modifyFunction) {
+let beforeCreateRouter = true;
+function modifyRoutes(modifyFunction) {
   if (beforeCreateRouter) {
     const { routes: originRoutes } = finalRouteConfig;
     const newRoutes = modifyFunction(originRoutes);
@@ -19,7 +19,7 @@ export function modifyRoutes(modifyFunction) {
     console.error("It is not allowed to modify routes config after create router.");
   }
 }
-export 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;
@@ -46,7 +46,6 @@ export const routerPlugin = ({ serverBase = [], supportHtml5History = true, base
           });
         },
         hoc: ({ App }, next) => {
-          var _routesConfig;
           if (!finalRouteConfig && !createRoutes) {
             return next({
               App
@@ -61,8 +60,7 @@ export const routerPlugin = ({ serverBase = [], supportHtml5History = true, base
               const runtimeContext = useContext(RuntimeReactContext);
               const { unstable_getBlockNavState: getBlockNavState } = runtimeContext;
               return useMemo(() => {
-                var _hydrationData;
-                if ((_hydrationData = hydrationData) === null || _hydrationData === void 0 ? void 0 : _hydrationData.errors) {
+                if (hydrationData === null || hydrationData === void 0 ? void 0 : hydrationData.errors) {
                   hydrationData = {
                     ...hydrationData,
                     errors: deserializeErrors(hydrationData.errors)
@@ -122,7 +120,7 @@ export const routerPlugin = ({ serverBase = [], supportHtml5History = true, base
           if (App) {
             RouteApp = hoistNonReactStatics(RouteApp, App);
           }
-          if ((_routesConfig = routesConfig) === null || _routesConfig === void 0 ? void 0 : _routesConfig.globalApp) {
+          if (routesConfig === null || routesConfig === void 0 ? void 0 : routesConfig.globalApp) {
             return next({
               App: hoistNonReactStatics(RouteApp, routesConfig.globalApp)
             });
@@ -157,3 +155,9 @@ export const routerPlugin = ({ serverBase = [], supportHtml5History = true, base
     }
   };
 };
+export {
+  beforeCreateRouter,
+  finalRouteConfig,
+  modifyRoutes,
+  routerPlugin
+};

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

@@ -1,11 +1,11 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useContext } from "react";
-import { createStaticHandler } from "@modern-js/utils/runtime/remix-router";
-import { createStaticRouter, StaticRouterProvider } from "@modern-js/utils/runtime-node/router";
+import { createStaticHandler } from "@modern-js/runtime-utils/remix-router";
+import { createStaticRouter, StaticRouterProvider } from "@modern-js/runtime-utils/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 { createRoutesFromElements } from "@modern-js/runtime-utils/router";
+import { createRequestContext, reporterCtx } from "@modern-js/runtime-utils/node";
+import { time } from "@modern-js/runtime-utils/time";
 import { LOADER_REPORTER_NAME } from "@modern-js/utils/universal/constants";
 import { RuntimeReactContext } from "../../core";
 import { renderRoutes, urlJoin } from "./utils";
@@ -23,7 +23,7 @@ function createFetchRequest(req) {
   };
   return new Request(url.href, init);
 }
-export function createFetchHeaders(requestHeaders) {
+function createFetchHeaders(requestHeaders) {
   const headers = new Headers();
   for (const [key, values] of Object.entries(requestHeaders || {})) {
     if (values) {
@@ -38,7 +38,7 @@ export function createFetchHeaders(requestHeaders) {
   }
   return headers;
 }
-export const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
+const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
   return {
     name: "@modern-js/plugin-router",
     registerHook: {
@@ -92,7 +92,6 @@ export const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
           });
         },
         hoc: ({ App }, next) => {
-          var _routesConfig;
           if (!routesConfig) {
             return next({
               App
@@ -112,7 +111,7 @@ export const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
             };
           };
           const RouteApp = getRouteApp();
-          if ((_routesConfig = routesConfig) === null || _routesConfig === void 0 ? void 0 : _routesConfig.globalApp) {
+          if (routesConfig === null || routesConfig === void 0 ? void 0 : routesConfig.globalApp) {
             return next({
               App: hoistNonReactStatics(RouteApp, routesConfig.globalApp)
             });
@@ -147,5 +146,10 @@ export const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
     }
   };
 };
-export const modifyRoutes = () => {
+const modifyRoutes = () => {
+};
+export {
+  createFetchHeaders,
+  modifyRoutes,
+  routerPlugin
 };