@modern-js/runtime 2.35.0 → 2.36.0

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

@@ -10,7 +10,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";
 var debug = createDebugger("html_genarate");
-export var getDocumenByEntryName = function getDocumenByEntryName2(entrypoints, entryName, fallbackDir) {
+var getDocumenByEntryName = function getDocumenByEntryName2(entrypoints, entryName, fallbackDir) {
   var _entrypoints_find;
   var entryDir = (_entrypoints_find = entrypoints.find(function(item) {
     return item.entryName === entryName;
@@ -28,7 +28,7 @@ export var getDocumenByEntryName = function getDocumenByEntryName2(entrypoints,
   var docFile = findExists(_to_consumable_array(entryDirs).concat(_to_consumable_array(fallbackDirs)));
   return docFile || void 0;
 };
-export var documentPlugin = function() {
+var documentPlugin = function() {
   return {
     name: "@modern-js/plugin-document",
     pre: [
@@ -44,7 +44,7 @@ export var documentPlugin = function() {
             config: {
               output: config.output
             },
-            entryName: entryName,
+            entryName,
             templateParams: templateParameters
           };
         }
@@ -57,16 +57,16 @@ export var documentPlugin = function() {
             }
             return function() {
               var _ref2 = _async_to_generator(function(param) {
-                var htmlWebpackPlugin, _tsConfig, _partialsByEntrypoint, config, documentParams, tempTsConfigFile, userTsConfigFilePath, tsConfig, err, htmlOutputFile, Document, HTMLElement, html, partialsByEntrypoint, scripts, partialsContent, links, metas, nonce, nonceAttr, finalHtml;
+                var htmlWebpackPlugin, config, documentParams, tempTsConfigFile, userTsConfigFilePath, tsConfig, err, htmlOutputFile, Document, HTMLElement, html, partialsByEntrypoint, scripts, partialsContent, links, metas, nonce, nonceAttr, finalHtml;
                 return _ts_generator(this, function(_state2) {
                   switch (_state2.label) {
                     case 0:
                       htmlWebpackPlugin = param.htmlWebpackPlugin;
                       config = api.useResolvedConfigContext();
                       documentParams = getDocParams({
-                        config: config,
-                        entryName: entryName,
-                        templateParameters: templateParameters
+                        config,
+                        entryName,
+                        templateParameters
                       });
                       tempTsConfigFile = path.join(internalDirectory, "./document/_tempTsconfig.json");
                       userTsConfigFilePath = path.join(appDirectory, "tsconfig.json");
@@ -96,7 +96,7 @@ export var documentPlugin = function() {
                         4
                       ];
                     case 4:
-                      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 = {
@@ -134,7 +134,7 @@ export var documentPlugin = function() {
                                   }
                                   return {
                                     path: args.path,
-                                    external: external
+                                    external
                                   };
                                 });
                               }
@@ -168,7 +168,7 @@ export var documentPlugin = function() {
                         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");
@@ -222,15 +222,14 @@ export var documentPlugin = function() {
                 return {
                   tools: {
                     htmlPlugin: function(options, entry) {
-                      var _options, _options1, _options2;
-                      var hackParameters = typeof ((_options = options) === null || _options === void 0 ? void 0 : _options.templateParameters) === "function" ? (_options1 = options) === null || _options1 === void 0 ? void 0 : _options1.templateParameters({}, {}, {}, {}) : _object_spread({}, (_options2 = options) === null || _options2 === void 0 ? void 0 : _options2.templateParameters);
+                      var hackParameters = typeof (options === null || options === void 0 ? void 0 : options.templateParameters) === "function" ? options === null || options === void 0 ? void 0 : options.templateParameters({}, {}, {}, {}) : _object_spread({}, options === null || options === void 0 ? void 0 : options.templateParameters);
                       var templateContent = documentEntry(
                         entry.entryName,
                         // options,
                         hackParameters
                       );
                       var documentHtmlOptions = templateContent ? {
-                        templateContent: templateContent,
+                        templateContent,
                         // Note: the behavior of inject/modify tags in afterTemplateExecution hook will not take effect
                         inject: false
                       } : {};
@@ -249,4 +248,9 @@ export var documentPlugin = function() {
     }()
   };
 };
-export default documentPlugin;
+var cli_default = documentPlugin;
+export {
+  cli_default as default,
+  documentPlugin,
+  getDocumenByEntryName
+};

package/dist/esm/document/constants.js

@@ -1,28 +1,50 @@
 import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { HTML_CHUNKSMAP_SEPARATOR } from "@modern-js/utils/universal/constants";
-export var DOC_EXT = [
+var DOC_EXT = [
   "jsx",
   "tsx",
   "ts",
   "js"
 ];
-export var DOCUMENT_META_PLACEHOLDER = encodeURIComponent("<%= meta %>");
-export var HTML_SEPARATOR = "<!--<?- html ?>-->";
-export var HEAD_PARTICALS_SEPARATOR = encodeURIComponent("<!--<?- partials.head ?>-->");
-export var BODY_PARTICALS_SEPARATOR = encodeURIComponent("<!--<?- partials.body ?>-->");
-export var TOP_PARTICALS_SEPARATOR = encodeURIComponent("<!--<?- partials.top ?>-->");
-export var HTML_SSRDATASCRIPT_SEPARATOR = "<!--<?- SSRDataScript ?>-->";
-export var DOCUMENT_SSR_PLACEHOLDER = encodeURIComponent(HTML_SEPARATOR);
-export var DOCUMENT_CHUNKSMAP_PLACEHOLDER = encodeURIComponent(HTML_CHUNKSMAP_SEPARATOR);
-export var DOCUMENT_SSRDATASCRIPT_PLACEHOLDER = encodeURIComponent(HTML_SSRDATASCRIPT_SEPARATOR);
-export var DOCUMENT_FILE_NAME = "Document";
-export var DOCUMENT_SCRIPTS_PLACEHOLDER = encodeURIComponent("<!-- chunk scripts placeholder -->");
-export var DOCUMENT_LINKS_PLACEHOLDER = encodeURIComponent("<!-- chunk links placeholder -->");
-export var DOCUMENT_SCRIPT_PLACEHOLDER_START = encodeURIComponent("<!-- script-start -->");
-export var DOCUMENT_SCRIPT_PLACEHOLDER_END = encodeURIComponent("<!-- script-end -->");
-export var DOCUMENT_STYLE_PLACEHOLDER_START = encodeURIComponent("<!-- style-start -->");
-export var DOCUMENT_STYLE_PLACEHOLDER_END = encodeURIComponent("<!-- style-end -->");
-export var DOCUMENT_COMMENT_PLACEHOLDER_START = encodeURIComponent("<!-- comment-start -->");
-export var DOCUMENT_COMMENT_PLACEHOLDER_END = encodeURIComponent("<!-- comment-end -->");
+var DOCUMENT_META_PLACEHOLDER = encodeURIComponent("<%= meta %>");
+var HTML_SEPARATOR = "<!--<?- html ?>-->";
+var HEAD_PARTICALS_SEPARATOR = encodeURIComponent("<!--<?- partials.head ?>-->");
+var BODY_PARTICALS_SEPARATOR = encodeURIComponent("<!--<?- partials.body ?>-->");
+var TOP_PARTICALS_SEPARATOR = encodeURIComponent("<!--<?- partials.top ?>-->");
+var HTML_SSRDATASCRIPT_SEPARATOR = "<!--<?- SSRDataScript ?>-->";
+var DOCUMENT_SSR_PLACEHOLDER = encodeURIComponent(HTML_SEPARATOR);
+var DOCUMENT_CHUNKSMAP_PLACEHOLDER = encodeURIComponent(HTML_CHUNKSMAP_SEPARATOR);
+var DOCUMENT_SSRDATASCRIPT_PLACEHOLDER = encodeURIComponent(HTML_SSRDATASCRIPT_SEPARATOR);
+var DOCUMENT_FILE_NAME = "Document";
+var DOCUMENT_SCRIPTS_PLACEHOLDER = encodeURIComponent("<!-- chunk scripts placeholder -->");
+var DOCUMENT_LINKS_PLACEHOLDER = encodeURIComponent("<!-- chunk links placeholder -->");
+var DOCUMENT_SCRIPT_PLACEHOLDER_START = encodeURIComponent("<!-- script-start -->");
+var DOCUMENT_SCRIPT_PLACEHOLDER_END = encodeURIComponent("<!-- script-end -->");
+var DOCUMENT_STYLE_PLACEHOLDER_START = encodeURIComponent("<!-- style-start -->");
+var DOCUMENT_STYLE_PLACEHOLDER_END = encodeURIComponent("<!-- style-end -->");
+var DOCUMENT_COMMENT_PLACEHOLDER_START = encodeURIComponent("<!-- comment-start -->");
+var DOCUMENT_COMMENT_PLACEHOLDER_END = encodeURIComponent("<!-- comment-end -->");
 var _obj;
-export var PLACEHOLDER_REPLACER_MAP = (_obj = {}, _define_property(_obj, DOCUMENT_SSR_PLACEHOLDER, HTML_SEPARATOR), _define_property(_obj, DOCUMENT_CHUNKSMAP_PLACEHOLDER, HTML_CHUNKSMAP_SEPARATOR), _define_property(_obj, DOCUMENT_SSRDATASCRIPT_PLACEHOLDER, HTML_SSRDATASCRIPT_SEPARATOR), _obj);
+var PLACEHOLDER_REPLACER_MAP = (_obj = {}, _define_property(_obj, DOCUMENT_SSR_PLACEHOLDER, HTML_SEPARATOR), _define_property(_obj, DOCUMENT_CHUNKSMAP_PLACEHOLDER, HTML_CHUNKSMAP_SEPARATOR), _define_property(_obj, DOCUMENT_SSRDATASCRIPT_PLACEHOLDER, HTML_SSRDATASCRIPT_SEPARATOR), _obj);
+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/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/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/exports/server.js

@@ -1,3 +1,6 @@
-export var hook = function(attacher) {
+var hook = function(attacher) {
   return attacher;
 };
+export {
+  hook
+};

package/dist/esm/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/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/router/cli/index.js

@@ -3,7 +3,7 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { getEntryOptions, createRuntimeExportsUtils, isRouterV5 as isV5 } from "@modern-js/utils";
 var PLUGIN_IDENTIFIER = "router";
 var ROUTES_IDENTIFIER = "routes";
-export var routerPlugin = function() {
+var routerPlugin = function() {
   return {
     name: "@modern-js/plugin-router",
     required: [
@@ -47,13 +47,12 @@ export var routerPlugin = function() {
         },
         modifyEntryImports: function modifyEntryImports(param) {
           var entrypoint = param.entrypoint, imports = param.imports;
-          var _runtimeConfig;
           var entryName = entrypoint.entryName, isMainEntry = entrypoint.isMainEntry, fileSystemRoutes = entrypoint.fileSystemRoutes;
           var userConfig = api.useResolvedConfigContext();
           var packageName = api.useAppContext().packageName;
           var 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",
@@ -68,8 +67,8 @@ export var routerPlugin = function() {
             throw new Error("should enable runtime.router for entry ".concat(entryName));
           }
           return {
-            entrypoint: entrypoint,
-            imports: imports
+            entrypoint,
+            imports
           };
         },
         modifyEntryRuntimePlugins: function modifyEntryRuntimePlugins(param) {
@@ -89,15 +88,15 @@ export var routerPlugin = function() {
             plugins.push({
               name: PLUGIN_IDENTIFIER,
               options: JSON.stringify(_object_spread_props(_object_spread({
-                serverBase: serverBase
+                serverBase
               }, runtimeConfig.router), {
                 routesConfig: fileSystemRoutes ? "{ ".concat(ROUTES_IDENTIFIER, ", globalApp: App }") : void 0
               })).replace(/"routesConfig"\s*:\s*"((\S|\s)+)"/g, '"routesConfig": $1,')
             });
           }
           return {
-            entrypoint: entrypoint,
-            plugins: plugins
+            entrypoint,
+            plugins
           };
         },
         addRuntimeExports: function addRuntimeExports() {
@@ -110,4 +109,8 @@ export var routerPlugin = function() {
     }
   };
 };
-export default routerPlugin;
+var cli_default = routerPlugin;
+export {
+  cli_default as default,
+  routerPlugin
+};

package/dist/esm/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/router/runtime/DefaultNotFound.js

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

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

@@ -1,4 +1,7 @@
-export default function() {
+function DeferredDataScripts_default() {
   return null;
 }
 ;
+export {
+  DeferredDataScripts_default as default
+};

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

@@ -1,15 +1,14 @@
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 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";
 var 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}}))};";
 var resolveFnStr = "function r(e,r,o,A){A?_ROUTER_DATA.r[e][r].reject(A):_ROUTER_DATA.r[e][r].resolve(o)};";
 var preResolvedFnStr = "function p(e,r){return void 0!==r?Promise.reject(new Error(r.message)):Promise.resolve(e)};";
 var DeferredDataScripts = function(props) {
-  var _props;
   var context = useContext(DataRouterContext);
   var staticContext = (context || {}).staticContext;
   var hydratedRef = useRef(false);
@@ -38,12 +37,11 @@ var DeferredDataScripts = function(props) {
       var deferredKeys = deferredData.deferredKeys;
       var deferredKeyPromiseStr = deferredKeys.map(function(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: routeId
+            routeId
           }, "".concat(routeId, " | ").concat(key)));
           return "".concat(JSON.stringify(key), ": _ROUTER_DATA.s(").concat(JSON.stringify(routeId), ",").concat(JSON.stringify(key), ") ");
         } else {
@@ -76,7 +74,7 @@ var DeferredDataScripts = function(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]
@@ -93,14 +91,14 @@ var DeferredDataScript = function(param) {
     children: typeof document === "undefined" && data && dataKey && routeId ? /* @__PURE__ */ _jsx(Await, {
       resolve: data,
       errorElement: /* @__PURE__ */ _jsx(ErrorDeferredDataScript, {
-        routeId: routeId,
-        dataKey: dataKey,
-        nonce: nonce
+        routeId,
+        dataKey,
+        nonce
       }),
       children: function(data2) {
         return /* @__PURE__ */ _jsx("script", {
           async: true,
-          nonce: nonce,
+          nonce,
           suppressHydrationWarning: true,
           dangerouslySetInnerHTML: {
             __html: "_ROUTER_DATA.r(".concat(JSON.stringify(routeId), ", ").concat(JSON.stringify(dataKey), ", ").concat(serializeJson(data2), ");")
@@ -114,7 +112,7 @@ var ErrorDeferredDataScript = function(param) {
   var routeId = param.routeId, dataKey = param.dataKey, nonce = param.nonce;
   var error = useAsyncError();
   return /* @__PURE__ */ _jsx("script", {
-    nonce: nonce,
+    nonce,
     suppressHydrationWarning: true,
     dangerouslySetInnerHTML: {
       __html: "_ROUTER_DATA.r(".concat(JSON.stringify(routeId), ", ").concat(JSON.stringify(dataKey), ", ").concat(void 0, ", ").concat(serializeJson({
@@ -124,4 +122,7 @@ var ErrorDeferredDataScript = function(param) {
     }
   });
 };
-export default DeferredDataScripts;
+var DeferredDataScripts_node_default = DeferredDataScripts;
+export {
+  DeferredDataScripts_node_default as default
+};

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

@@ -5,12 +5,11 @@ import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 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 function(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);
     }
@@ -99,8 +98,7 @@ function _loadRouteModule() {
           return [
             4,
             Promise.all(chunkIds.map(function(chunkId) {
-              var _$__webpack_chunk_load__;
-              return (_$__webpack_chunk_load__ = __webpack_chunk_load__) === null || _$__webpack_chunk_load__ === void 0 ? void 0 : _$__webpack_chunk_load__(String(chunkId));
+              return __webpack_chunk_load__ === null || __webpack_chunk_load__ === void 0 ? void 0 : __webpack_chunk_load__(String(chunkId));
             }))
           ];
         case 2:
@@ -138,7 +136,7 @@ var createDataHref = function(href) {
   return /* @__PURE__ */ _jsx("link", {
     rel: "prefetch",
     as: "fetch",
-    href: href
+    href
   }, href);
 };
 var getDataHref = function(route, pathname, basename) {
@@ -154,8 +152,7 @@ var PrefetchPageLinks = function(param) {
   var routeAssets = (routeManifest || {}).routeAssets;
   var matches = Array.isArray(routes) ? matchRoutes(routes, pathname) : [];
   if (Array.isArray(matches) && routeAssets) {
-    var _matches;
-    (_matches = matches) === null || _matches === void 0 ? void 0 : _matches.forEach(function(match) {
+    matches === null || matches === void 0 ? void 0 : matches.forEach(function(match) {
       return loadRouteModule(match.route, routeAssets);
     });
   }
@@ -163,9 +160,9 @@ var PrefetchPageLinks = function(param) {
     return null;
   }
   return /* @__PURE__ */ _jsx(PrefetchDataLinks, {
-    matches: matches,
-    pathname: pathname,
-    routeManifest: routeManifest
+    matches,
+    pathname,
+    routeManifest
   });
 };
 var PrefetchDataLinks = function(param) {
@@ -173,8 +170,7 @@ var PrefetchDataLinks = function(param) {
   var currentMatches = useMatches();
   var basename = useHref("/");
   var dataHrefs = useMemo(function() {
-    var _matches;
-    return (_matches = matches) === null || _matches === void 0 ? void 0 : _matches.filter(function(match, index) {
+    return matches === null || matches === void 0 ? void 0 : matches.filter(function(match, index) {
       if (!match.route.loader || typeof match.route.loader !== "function" || match.route.loader.length === 0) {
         return false;
       }
@@ -215,10 +211,10 @@ var createPrefetchLink = function(Link2) {
       children: [
         /* @__PURE__ */ _jsx(Link2, _object_spread({
           ref: forwardedRef,
-          to: to
+          to
         }, props, prefetchHandlers)),
         shouldPrefetch && __webpack_chunk_load__ && !isAbsolute ? /* @__PURE__ */ _jsx(PrefetchPageLinks, {
-          pathname: pathname
+          pathname
         }) : null
       ]
     });
@@ -228,4 +224,8 @@ var Link = createPrefetchLink(RouterLink);
 Link.displayName = "Link";
 var NavLink = createPrefetchLink(RouterNavLink);
 NavLink.displayName = "NavLink";
-export { Link, NavLink };
+export {
+  Link,
+  NavLink,
+  composeEventHandlers
+};

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

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

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

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

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

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

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

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

package/dist/esm/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 var useRouteLoaderData = function(routeId) {
+import { Link, NavLink } from "./PrefetchLink";
+var useRouteLoaderData = function(routeId) {
   var 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
+};