@modern-js/runtime 2.18.0 → 2.18.1

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @modern-js/runtime
 
+## 2.18.1
+
+### Patch Changes
+
+- 8fb93d1: fix: replace route id correctly
+  fix: 正确地替换 route id
+  - @modern-js/plugin@2.18.1
+  - @modern-js/types@2.18.1
+  - @modern-js/utils@2.18.1
+
 ## 2.18.0
 
 ### Minor Changes

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

@@ -9,7 +9,7 @@ Object.defineProperty(exports, "default", {
 const _jsxruntime = require("react/jsx-runtime");
 const _react = require("react");
 const _reactrouterdom = require("react-router-dom");
-const _serialize = require("@modern-js/utils/universal/serialize");
+const _runtimenode = require("@modern-js/utils/runtime-node");
 const _common = require("../../common");
 const _utils = require("./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}}))};`;
@@ -32,7 +32,7 @@ const DeferredDataScripts = () => {
       errors: (0, _utils.serializeErrors)(staticContext.errors)
     };
     let initialScripts = [
-      `_ROUTER_DATA = ${(0, _serialize.serializeJson)(_ROUTER_DATA)};`,
+      `_ROUTER_DATA = ${(0, _runtimenode.serializeJson)(_ROUTER_DATA)};`,
       `_ROUTER_DATA.s = ${setupFnStr}`,
       `_ROUTER_DATA.r = ${resolveFnStr}`,
       `_ROUTER_DATA.p = ${preResolvedFnStr}`
@@ -56,12 +56,12 @@ const DeferredDataScripts = () => {
               message: trackedPromise._error.message,
               stack: process.env.NODE_ENV !== "production" ? trackedPromise._error.stack : void 0
             };
-            return `${JSON.stringify(key)}: _ROUTER_DATA.p(${void 0}, ${(0, _serialize.serializeJson)(error)})`;
+            return `${JSON.stringify(key)}: _ROUTER_DATA.p(${void 0}, ${(0, _runtimenode.serializeJson)(error)})`;
           } else {
             if (typeof trackedPromise._data === "undefined") {
               throw new Error(`The deferred data for ${key} was not resolved, did you forget to return data from a deferred promise`);
             }
-            return `${JSON.stringify(key)}: _ROUTER_DATA.p(${(0, _serialize.serializeJson)(trackedPromise._data)})`;
+            return `${JSON.stringify(key)}: _ROUTER_DATA.p(${(0, _runtimenode.serializeJson)(trackedPromise._data)})`;
           }
         }
       }).join(",\n");
@@ -101,7 +101,7 @@ const DeferredDataScript = ({ data, routeId, dataKey }) => {
         async: true,
         suppressHydrationWarning: true,
         dangerouslySetInnerHTML: {
-          __html: `_ROUTER_DATA.r(${JSON.stringify(routeId)}, ${JSON.stringify(dataKey)}, ${(0, _serialize.serializeJson)(data2)});`
+          __html: `_ROUTER_DATA.r(${JSON.stringify(routeId)}, ${JSON.stringify(dataKey)}, ${(0, _runtimenode.serializeJson)(data2)});`
         }
       })
     }) : null
@@ -112,7 +112,7 @@ const ErrorDeferredDataScript = ({ routeId, dataKey }) => {
   return /* @__PURE__ */ (0, _jsxruntime.jsx)("script", {
     suppressHydrationWarning: true,
     dangerouslySetInnerHTML: {
-      __html: `_ROUTER_DATA.r(${JSON.stringify(routeId)}, ${JSON.stringify(dataKey)}, ${void 0}, ${(0, _serialize.serializeJson)({
+      __html: `_ROUTER_DATA.r(${JSON.stringify(routeId)}, ${JSON.stringify(dataKey)}, ${void 0}, ${(0, _runtimenode.serializeJson)({
         message: error.message,
         stack: error.stack
       })});`

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

@@ -73,15 +73,15 @@ _export(exports, {
   createPath: () => _reactrouterdom.createPath,
   unstable_useBlocker: () => _reactrouterdom.unstable_useBlocker,
   unstable_usePrompt: () => _reactrouterdom.unstable_usePrompt,
-  defer: () => _remixrouter.defer,
-  json: () => _remixrouter.json,
-  redirect: () => _remixrouter.redirect
+  defer: () => _router.defer,
+  json: () => _router.json,
+  redirect: () => _router.redirect
 });
 const _reactrouterdom = require("react-router-dom");
 const _plugin = require("./plugin");
 _export_star(require("./withRouter"), exports);
 const _PrefetchLink = require("./PrefetchLink");
-const _remixrouter = require("@modern-js/utils/universal/remix-router");
+const _router = require("@modern-js/utils/runtime/router");
 function _export_star(from, to) {
   Object.keys(from).forEach(function(k) {
     if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
@@ -97,6 +97,6 @@ function _export_star(from, to) {
 }
 const _default = _plugin.routerPlugin;
 const useRouteLoaderData = (routeId) => {
-  const realRouteId = routeId.replace(/\((.*?)\)/g, "[$1]");
+  const realRouteId = routeId.replace(/\[(.*?)\]/g, "($1)");
   return (0, _reactrouterdom.useRouteLoaderData)(realRouteId);
 };

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

@@ -19,7 +19,7 @@ const _jsxruntime = require("react/jsx-runtime");
 const _react = /* @__PURE__ */ _interop_require_default(require("react"));
 const _reactrouterdom = require("react-router-dom");
 const _hoistnonreactstatics = /* @__PURE__ */ _interop_require_default(require("hoist-non-react-statics"));
-const _runtime = require("@modern-js/utils/runtime");
+const _runtimebrowser = require("@modern-js/utils/runtime-browser");
 const _hooks = require("./hooks");
 const _utils = require("./utils");
 function _interop_require_default(obj) {
@@ -44,7 +44,7 @@ const routerPlugin = ({ serverBase = [], supportHtml5History = true, basename =
   const select = (pathname) => serverBase.find((baseUrl) => pathname.search(baseUrl) === 0) || "/";
   let routes = [];
   finalRouteConfig = routesConfig;
-  window._SERVER_DATA = (0, _runtime.parsedJSONFromElement)("__MODERN_SERVER_DATA__");
+  window._SERVER_DATA = (0, _runtimebrowser.parsedJSONFromElement)("__MODERN_SERVER_DATA__");
   return {
     name: "@modern-js/plugin-router",
     registerHook: {

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

@@ -16,7 +16,7 @@ _export(exports, {
 });
 const _jsxruntime = require("react/jsx-runtime");
 const _react = /* @__PURE__ */ _interop_require_wildcard(require("react"));
-const _remixrouter = require("@modern-js/utils/universal/remix-router");
+const _router = require("@modern-js/utils/runtime/router");
 const _server = require("react-router-dom/server");
 const _hoistnonreactstatics = /* @__PURE__ */ _interop_require_default(require("hoist-non-react-statics"));
 const _reactrouterdom = require("react-router-dom");
@@ -117,7 +117,7 @@ const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
             routesConfig,
             ssrMode
           }));
-          const { query } = (0, _remixrouter.createStaticHandler)(routes, {
+          const { query } = (0, _router.createStaticHandler)(routes, {
             basename: _basename
           });
           const remixRequest = createFetchRequest(request);

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

@@ -21,8 +21,7 @@ _export(exports, {
 const _jsxruntime = require("react/jsx-runtime");
 const _react = /* @__PURE__ */ _interop_require_default(require("react"));
 const _reactrouterdom = require("react-router-dom");
-const _remixrouter = require("@modern-js/utils/universal/remix-router");
-const _nestedRoutes = require("@modern-js/utils/universal/nestedRoutes");
+const _router = require("@modern-js/utils/runtime/router");
 const _DefaultNotFound = require("./DefaultNotFound");
 const _DeferredDataScripts = /* @__PURE__ */ _interop_require_default(require("./DeferredDataScripts"));
 function _interop_require_default(obj) {
@@ -46,7 +45,7 @@ function getRouteComponents(routes, { globalApp, ssrMode, props }) {
   const routeElements = [];
   for (const route of routes) {
     if (route.type === "nested") {
-      const routeElement = (0, _nestedRoutes.renderNestedRoute)(route, {
+      const routeElement = (0, _router.renderNestedRoute)(route, {
         DeferredDataComponent: ssrMode === "stream" ? _DeferredDataScripts.default : void 0,
         props
       });
@@ -120,7 +119,7 @@ function serializeErrors(errors) {
   const entries = Object.entries(errors);
   const serialized = {};
   for (const [key, val] of entries) {
-    if ((0, _remixrouter.isRouteErrorResponse)(val)) {
+    if ((0, _router.isRouteErrorResponse)(val)) {
       serialized[key] = {
         ...val,
         __type: "RouteErrorResponse"
@@ -145,7 +144,7 @@ function deserializeErrors(errors) {
   const serialized = {};
   for (const [key, val] of entries) {
     if (val && val.__type === "RouteErrorResponse") {
-      serialized[key] = new _remixrouter.ErrorResponse(val.status, val.statusText, val.data, val.internal === true);
+      serialized[key] = new _router.ErrorResponse(val.status, val.statusText, val.data, val.internal === true);
     } else if (val && val.__type === "Error") {
       const error = new Error(val.message);
       error.stack = val.stack;

package/dist/cjs/ssr/cli/index.js

@@ -70,8 +70,8 @@ const _default = () => {
           return {
             source: {
               alias: {
-                // ensure that all packages use the same storage in @modern-js/utils/ssr
-                "@modern-js/utils/ssr": require.resolve("@modern-js/utils/ssr"),
+                // ensure that all packages use the same storage in @modern-js/utils/runtime-node
+                "@modern-js/utils/runtime-node": require.resolve("@modern-js/utils/runtime-node"),
                 "@modern-js/runtime/plugins": pluginsExportsUtils.getPath()
               },
               globalVars: (values, { target }) => {

package/dist/cjs/ssr/index.js

@@ -16,7 +16,7 @@ _export(exports, {
 const _jsxruntime = require("react/jsx-runtime");
 const _component = require("@loadable/component");
 const _hoistnonreactstatics = /* @__PURE__ */ _interop_require_default(require("hoist-non-react-statics"));
-const _runtime = require("@modern-js/utils/runtime");
+const _runtimebrowser = require("@modern-js/utils/runtime-browser");
 const _types = require("./serverRender/types");
 const _withCallback = require("./react/withCallback");
 const _utils = require("./utils");
@@ -46,8 +46,8 @@ const ssr = (config) => {
     setup: () => {
       const mockResp = (0, _utils.mockResponse)();
       if (config.inlineScript === false) {
-        window._SSR_DATA = (0, _runtime.parsedJSONFromElement)(_utils1.SSR_DATA_JSON_ID);
-        window._ROUTER_DATA = (0, _runtime.parsedJSONFromElement)(_utils1.ROUTER_DATA_JSON_ID);
+        window._SSR_DATA = (0, _runtimebrowser.parsedJSONFromElement)(_utils1.SSR_DATA_JSON_ID);
+        window._ROUTER_DATA = (0, _runtimebrowser.parsedJSONFromElement)(_utils1.ROUTER_DATA_JSON_ID);
       }
       return {
         client: async ({ App, context, ModernRender, ModernHydrate }) => {

package/dist/cjs/ssr/prefetch.js

@@ -8,10 +8,10 @@ Object.defineProperty(exports, "default", {
 });
 const _jsxruntime = require("react/jsx-runtime");
 const _server = require("react-dom/server");
-const _ssr = require("@modern-js/utils/ssr");
+const _runtimenode = require("@modern-js/utils/runtime-node");
 const _server1 = require("@loadable/server");
 const prefetch = async (App, context) => {
-  return (0, _ssr.run)(context.ssrContext.request.headers, async () => {
+  return (0, _runtimenode.run)(context.ssrContext.request.headers, async () => {
     var _context_store;
     const { ssrContext } = context;
     const { loadableStats } = ssrContext;

package/dist/cjs/ssr/serverRender/renderToStream/buildTemplate.after.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "buildShellAfterTemplate", {
   enumerable: true,
   get: () => buildShellAfterTemplate
 });
-const _serialize = require("@modern-js/utils/universal/serialize");
+const _runtimenode = require("@modern-js/utils/runtime-node");
 const _buildTemplateshare = require("./buildTemplate.share");
 function buildShellAfterTemplate(afterAppTemplate, options) {
   const callbacks = [
@@ -40,7 +40,7 @@ function buildShellAfterTemplate(afterAppTemplate, options) {
         renderLevel
       };
       return `
-      <script>window._SSR_DATA = ${(0, _serialize.serializeJson)(SSRData)}</script>
+      <script>window._SSR_DATA = ${(0, _runtimenode.serializeJson)(SSRData)}</script>
       `;
     }
   }

package/dist/cjs/ssr/serverRender/renderToStream/index.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "render", {
   get: () => render
 });
 const _react = require("react");
-const _ssr = require("@modern-js/utils/ssr");
+const _runtimenode = require("@modern-js/utils/runtime-node");
 const _prerender = require("../../react/prerender");
 const _time = require("../time");
 const _renderToPipe = /* @__PURE__ */ _interop_require_default(require("./renderToPipe"));
@@ -21,7 +21,7 @@ const render = ({ App, context }) => {
   if (!ssrContext) {
     throw new Error('The "ssrContext" must not be undefined, but received undefined');
   }
-  return (0, _ssr.run)(ssrContext.request.headers, async () => {
+  return (0, _runtimenode.run)(ssrContext.request.headers, async () => {
     const end = (0, _time.time)();
     const rootElement = (0, _react.createElement)(App, {
       context: Object.assign(context || {}, {

package/dist/cjs/ssr/serverRender/renderToString/entry.js

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "default", {
 });
 const _react = /* @__PURE__ */ _interop_require_default(require("react"));
 const _server = /* @__PURE__ */ _interop_require_default(require("react-dom/server"));
-const _serialize = require("@modern-js/utils/universal/serialize");
+const _runtimenode = require("@modern-js/utils/runtime-node");
 const _reacthelmet = /* @__PURE__ */ _interop_require_default(require("react-helmet"));
 const _utils = require("../../../router/runtime/utils");
 const _helmet = /* @__PURE__ */ _interop_require_default(require("../helmet"));
@@ -183,10 +183,10 @@ class Entry {
   }
   getSSRDataScript(templateData, routerData) {
     const useInlineScript = this.pluginConfig.inlineScript !== false;
-    const ssrData = (0, _serialize.serializeJson)(templateData);
+    const ssrData = (0, _runtimenode.serializeJson)(templateData);
     let ssrDataScripts = useInlineScript ? `<script>window._SSR_DATA = ${ssrData}</script>` : `<script type="application/json" id="${_utils1.SSR_DATA_JSON_ID}">${ssrData}</script>`;
     if (routerData) {
-      const serializedRouterData = (0, _serialize.serializeJson)(routerData);
+      const serializedRouterData = (0, _runtimenode.serializeJson)(routerData);
       ssrDataScripts += useInlineScript ? `
 <script>window._ROUTER_DATA = ${serializedRouterData}</script>` : `
 <script type="application/json" id="${_utils1.ROUTER_DATA_JSON_ID}">${serializedRouterData}</script>`;

package/dist/cjs/ssr/serverRender/renderToString/index.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "render", {
   enumerable: true,
   get: () => render
 });
-const _ssr = require("@modern-js/utils/ssr");
+const _runtimenode = require("@modern-js/utils/runtime-node");
 const _prerender = require("../../react/prerender");
 const _time = require("../time");
 const _entry = /* @__PURE__ */ _interop_require_default(require("./entry"));
@@ -17,7 +17,7 @@ function _interop_require_default(obj) {
 }
 const render = ({ App, context, config }) => {
   const ssrContext = context.ssrContext;
-  return (0, _ssr.run)(ssrContext.request.headers, async () => {
+  return (0, _runtimenode.run)(ssrContext.request.headers, async () => {
     const entry = new _entry.default({
       ctx: ssrContext,
       App,

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

@@ -59,7 +59,7 @@ function _unsupported_iterable_to_array(o, minLen) {
 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 "react-router-dom";
-import { serializeJson } from "@modern-js/utils/universal/serialize";
+import { serializeJson } from "@modern-js/utils/runtime-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}}))};";

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

@@ -5,7 +5,7 @@ export { modifyRoutes } from "./plugin";
 export * from "./withRouter";
 export { Link, NavLink } from "./PrefetchLink";
 export var useRouteLoaderData = function(routeId) {
-  var realRouteId = routeId.replace(/\((.*?)\)/g, "[$1]");
+  var realRouteId = routeId.replace(/\[(.*?)\]/g, "($1)");
   return useRouteData(realRouteId);
 };
 export {
@@ -63,4 +63,4 @@ export {
   unstable_useBlocker,
   unstable_usePrompt
 } from "react-router-dom";
-export { defer, json, redirect } from "@modern-js/utils/universal/remix-router";
+export { defer, json, redirect } from "@modern-js/utils/runtime/router";

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

@@ -53,7 +53,7 @@ function _object_spread_props(target, source) {
 import { jsx as _jsx } from "react/jsx-runtime";
 import { createBrowserRouter, createHashRouter, RouterProvider, createRoutesFromElements, useMatches, useLocation } from "react-router-dom";
 import hoistNonReactStatics from "hoist-non-react-statics";
-import { parsedJSONFromElement } from "@modern-js/utils/runtime";
+import { parsedJSONFromElement } from "@modern-js/utils/runtime-browser";
 import { modifyRoutes as modifyRoutesHook } from "./hooks";
 import { deserializeErrors, renderRoutes, urlJoin } from "./utils";
 export var finalRouteConfig = {

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

@@ -248,7 +248,7 @@ var __generator = function(thisArg, body) {
 };
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useContext } from "react";
-import { createStaticHandler } from "@modern-js/utils/universal/remix-router";
+import { createStaticHandler } from "@modern-js/utils/runtime/router";
 import { createStaticRouter, StaticRouterProvider } from "react-router-dom/server";
 import hoistNonReactStatics from "hoist-non-react-statics";
 import { createRoutesFromElements } from "react-router-dom";

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

@@ -149,8 +149,7 @@ function _unsupported_iterable_to_array(o, minLen) {
 }
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Route } from "react-router-dom";
-import { ErrorResponse, isRouteErrorResponse } from "@modern-js/utils/universal/remix-router";
-import { renderNestedRoute } from "@modern-js/utils/universal/nestedRoutes";
+import { ErrorResponse, isRouteErrorResponse, renderNestedRoute } from "@modern-js/utils/runtime/router";
 import { DefaultNotFound } from "./DefaultNotFound";
 import DeferredDataScripts from "./DeferredDataScripts";
 export function getRouteComponents(routes, param) {

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

@@ -76,8 +76,8 @@ export default function() {
           return {
             source: {
               alias: {
-                // ensure that all packages use the same storage in @modern-js/utils/ssr
-                "@modern-js/utils/ssr": require.resolve("@modern-js/utils/ssr"),
+                // ensure that all packages use the same storage in @modern-js/utils/runtime-node
+                "@modern-js/utils/runtime-node": require.resolve("@modern-js/utils/runtime-node"),
                 "@modern-js/runtime/plugins": pluginsExportsUtils.getPath()
               },
               globalVars: function(values, param) {

package/dist/esm/ssr/index.js

@@ -184,7 +184,7 @@ var __generator = function(thisArg, body) {
 import { jsx as _jsx } from "react/jsx-runtime";
 import { loadableReady } from "@loadable/component";
 import hoistNonReactStatics from "hoist-non-react-statics";
-import { parsedJSONFromElement } from "@modern-js/utils/runtime";
+import { parsedJSONFromElement } from "@modern-js/utils/runtime-browser";
 import { RenderLevel } from "./serverRender/types";
 import { WithCallback } from "./react/withCallback";
 import { formatClient, mockResponse, isReact18 } from "./utils";

package/dist/esm/ssr/prefetch.js

@@ -131,7 +131,7 @@ var __generator = function(thisArg, body) {
 };
 import { jsx as _jsx } from "react/jsx-runtime";
 import { renderToStaticMarkup } from "react-dom/server";
-import { run } from "@modern-js/utils/ssr";
+import { run } from "@modern-js/utils/runtime-node";
 import { ChunkExtractor } from "@loadable/server";
 var prefetch = function() {
   var _ref = _async_to_generator(function(App, context) {

package/dist/esm/ssr/serverRender/renderToStream/buildTemplate.after.js

@@ -26,7 +26,7 @@ function _object_spread(target) {
   }
   return target;
 }
-import { serializeJson } from "@modern-js/utils/universal/serialize";
+import { serializeJson } from "@modern-js/utils/runtime-node";
 import { buildTemplate } from "./buildTemplate.share";
 export function buildShellAfterTemplate(afterAppTemplate, options) {
   var injectSSRDataScript = function injectSSRDataScript2(template) {

package/dist/esm/ssr/serverRender/renderToStream/index.js

@@ -130,7 +130,7 @@ var __generator = function(thisArg, body) {
   }
 };
 import { createElement } from "react";
-import { run } from "@modern-js/utils/ssr";
+import { run } from "@modern-js/utils/runtime-node";
 import { PreRender } from "../../react/prerender";
 import { time } from "../time";
 import renderToPipe from "./renderToPipe";

package/dist/esm/ssr/serverRender/renderToString/entry.js

@@ -181,7 +181,7 @@ var __generator = function(thisArg, body) {
 };
 import React from "react";
 import ReactDomServer from "react-dom/server";
-import { serializeJson } from "@modern-js/utils/universal/serialize";
+import { serializeJson } from "@modern-js/utils/runtime-node";
 import ReactHelmet from "react-helmet";
 import { serializeErrors } from "../../../router/runtime/utils";
 import helmetReplace from "../helmet";

package/dist/esm/ssr/serverRender/renderToString/index.js

@@ -129,7 +129,7 @@ var __generator = function(thisArg, body) {
     };
   }
 };
-import { run } from "@modern-js/utils/ssr";
+import { run } from "@modern-js/utils/runtime-node";
 import { PreRender } from "../../react/prerender";
 import { time } from "../time";
 import SSREntry from "./entry";

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

@@ -1,7 +1,7 @@
 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 "react-router-dom";
-import { serializeJson } from "@modern-js/utils/universal/serialize";
+import { serializeJson } from "@modern-js/utils/runtime-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}}))};`;

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

@@ -5,7 +5,7 @@ export { modifyRoutes } from "./plugin";
 export * from "./withRouter";
 export { Link, NavLink } from "./PrefetchLink";
 export const useRouteLoaderData = (routeId) => {
-  const realRouteId = routeId.replace(/\((.*?)\)/g, "[$1]");
+  const realRouteId = routeId.replace(/\[(.*?)\]/g, "($1)");
   return useRouteData(realRouteId);
 };
 export {
@@ -63,4 +63,4 @@ export {
   unstable_useBlocker,
   unstable_usePrompt
 } from "react-router-dom";
-export { defer, json, redirect } from "@modern-js/utils/universal/remix-router";
+export { defer, json, redirect } from "@modern-js/utils/runtime/router";

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

@@ -1,7 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { createBrowserRouter, createHashRouter, RouterProvider, createRoutesFromElements, useMatches, useLocation } from "react-router-dom";
 import hoistNonReactStatics from "hoist-non-react-statics";
-import { parsedJSONFromElement } from "@modern-js/utils/runtime";
+import { parsedJSONFromElement } from "@modern-js/utils/runtime-browser";
 import { modifyRoutes as modifyRoutesHook } from "./hooks";
 import { deserializeErrors, renderRoutes, urlJoin } from "./utils";
 export let finalRouteConfig = {

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

@@ -1,6 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useContext } from "react";
-import { createStaticHandler } from "@modern-js/utils/universal/remix-router";
+import { createStaticHandler } from "@modern-js/utils/runtime/router";
 import { createStaticRouter, StaticRouterProvider } from "react-router-dom/server";
 import hoistNonReactStatics from "hoist-non-react-statics";
 import { createRoutesFromElements } from "react-router-dom";

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

@@ -1,7 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Route } from "react-router-dom";
-import { ErrorResponse, isRouteErrorResponse } from "@modern-js/utils/universal/remix-router";
-import { renderNestedRoute } from "@modern-js/utils/universal/nestedRoutes";
+import { ErrorResponse, isRouteErrorResponse, renderNestedRoute } from "@modern-js/utils/runtime/router";
 import { DefaultNotFound } from "./DefaultNotFound";
 import DeferredDataScripts from "./DeferredDataScripts";
 export function getRouteComponents(routes, { globalApp, ssrMode, props }) {

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

@@ -57,8 +57,8 @@ export default () => {
           return {
             source: {
               alias: {
-                // ensure that all packages use the same storage in @modern-js/utils/ssr
-                "@modern-js/utils/ssr": require.resolve("@modern-js/utils/ssr"),
+                // ensure that all packages use the same storage in @modern-js/utils/runtime-node
+                "@modern-js/utils/runtime-node": require.resolve("@modern-js/utils/runtime-node"),
                 "@modern-js/runtime/plugins": pluginsExportsUtils.getPath()
               },
               globalVars: (values, { target }) => {

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

@@ -1,7 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { loadableReady } from "@loadable/component";
 import hoistNonReactStatics from "hoist-non-react-statics";
-import { parsedJSONFromElement } from "@modern-js/utils/runtime";
+import { parsedJSONFromElement } from "@modern-js/utils/runtime-browser";
 import { RenderLevel } from "./serverRender/types";
 import { WithCallback } from "./react/withCallback";
 import { formatClient, mockResponse, isReact18 } from "./utils";

package/dist/esm-node/ssr/prefetch.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { renderToStaticMarkup } from "react-dom/server";
-import { run } from "@modern-js/utils/ssr";
+import { run } from "@modern-js/utils/runtime-node";
 import { ChunkExtractor } from "@loadable/server";
 const prefetch = async (App, context) => {
   return run(context.ssrContext.request.headers, async () => {

package/dist/esm-node/ssr/serverRender/renderToStream/buildTemplate.after.js

@@ -1,4 +1,4 @@
-import { serializeJson } from "@modern-js/utils/universal/serialize";
+import { serializeJson } from "@modern-js/utils/runtime-node";
 import { buildTemplate } from "./buildTemplate.share";
 export function buildShellAfterTemplate(afterAppTemplate, options) {
   const callbacks = [

package/dist/esm-node/ssr/serverRender/renderToStream/index.js

@@ -1,5 +1,5 @@
 import { createElement } from "react";
-import { run } from "@modern-js/utils/ssr";
+import { run } from "@modern-js/utils/runtime-node";
 import { PreRender } from "../../react/prerender";
 import { time } from "../time";
 import renderToPipe from "./renderToPipe";

package/dist/esm-node/ssr/serverRender/renderToString/entry.js

@@ -13,7 +13,7 @@ function _define_property(obj, key, value) {
 }
 import React from "react";
 import ReactDomServer from "react-dom/server";
-import { serializeJson } from "@modern-js/utils/universal/serialize";
+import { serializeJson } from "@modern-js/utils/runtime-node";
 import ReactHelmet from "react-helmet";
 import { serializeErrors } from "../../../router/runtime/utils";
 import helmetReplace from "../helmet";

package/dist/esm-node/ssr/serverRender/renderToString/index.js

@@ -1,4 +1,4 @@
-import { run } from "@modern-js/utils/ssr";
+import { run } from "@modern-js/utils/runtime-node";
 import { PreRender } from "../../react/prerender";
 import { time } from "../time";
 import SSREntry from "./entry";

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

@@ -10,4 +10,4 @@ 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 'react-router-dom';
 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 } from 'react-router-dom';
-export { defer, json, redirect } from '@modern-js/utils/universal/remix-router';
+export { defer, json, redirect } from '@modern-js/utils/runtime/router';

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import { type NestedRoute, type PageRoute, type SSRMode } from '@modern-js/types';
-import { type Router, type StaticHandlerContext } from '@modern-js/utils/universal/remix-router';
+import { type Router, type StaticHandlerContext } from '@modern-js/utils/runtime/router';
 import { RouterConfig } from './types';
 export declare function getRouteComponents(routes: (NestedRoute | PageRoute)[], {
   globalApp,

package/dist/types/runtimeContext.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import { Store } from '@modern-js-reduck/store';
-import type { StaticHandlerContext } from '@modern-js/utils/universal/remix-router';
+import type { StaticHandlerContext } from '@modern-js/utils/runtime/router';
 import { createLoaderManager } from './core/loader/loaderManager';
 import { runtime } from './core/plugin';
 import { RouteManifest } from './router/runtime/types';

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.18.0",
+  "version": "2.18.1",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -162,9 +162,9 @@
     "react-side-effect": "^2.1.1",
     "redux-logger": "^3.0.6",
     "styled-components": "^5.3.1",
-    "@modern-js/plugin": "2.18.0",
-    "@modern-js/types": "2.18.0",
-    "@modern-js/utils": "2.18.0"
+    "@modern-js/plugin": "2.18.1",
+    "@modern-js/types": "2.18.1",
+    "@modern-js/utils": "2.18.1"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -184,11 +184,11 @@
     "react-dom": "^18",
     "ts-jest": "^29.0.5",
     "typescript": "^4",
-    "@modern-js/app-tools": "2.18.0",
-    "@modern-js/core": "2.18.0",
-    "@modern-js/server-core": "2.18.0",
-    "@scripts/build": "2.18.0",
-    "@scripts/jest-config": "2.18.0"
+    "@modern-js/app-tools": "2.18.1",
+    "@modern-js/core": "2.18.1",
+    "@modern-js/server-core": "2.18.1",
+    "@scripts/build": "2.18.1",
+    "@scripts/jest-config": "2.18.1"
   },
   "sideEffects": false,
   "modernConfig": {},