@modern-js/runtime 2.34.0 → 2.35.1

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

@@ -1,9 +1,9 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { renderToStaticMarkup } from "react-dom/server";
-import { run } from "@modern-js/utils/runtime-node";
+import { run } from "@modern-js/runtime-utils/node";
 import { ChunkExtractor } from "@loadable/server";
 const prefetch = async (App, context, config) => run(context.ssrContext.request.headers, async () => {
-  var _context_store, _context;
+  var _context_store;
   const { ssrContext } = context;
   const { loadableStats } = ssrContext;
   if (!config.disablePrerender) {
@@ -43,7 +43,7 @@ const prefetch = async (App, context, config) => run(context.ssrContext.request.
     initialData: context.initialData,
     i18nData: context.__i18nData__,
     // todo: move to plugin state
-    storeState: (_context = context) === null || _context === void 0 ? void 0 : (_context_store = _context.store) === null || _context_store === void 0 ? void 0 : _context_store.getState()
+    storeState: context === null || context === void 0 ? void 0 : (_context_store = context.store) === null || _context_store === void 0 ? void 0 : _context_store.getState()
   };
 });
 export default prefetch;

package/dist/esm-node/ssr/react/prerender/util.js

@@ -27,9 +27,8 @@ export const aggKeysFromPropsList = function aggKeysFromPropsList2(propsList, pr
   }, {});
   const res = propsList.filter((props) => usefulObject(props[propName])).reduce((result, next) => {
     REQUEST_META.forEach((key) => {
-      var _prop;
       const prop = next[propName];
-      if (((_prop = prop) === null || _prop === void 0 ? void 0 : _prop.hasOwnProperty(key)) && usefulArray(prop[key])) {
+      if ((prop === null || prop === void 0 ? void 0 : prop.hasOwnProperty(key)) && usefulArray(prop[key])) {
         result[key] = unique(result[key].concat(prop[key]));
       }
     });
@@ -52,9 +51,8 @@ export const aggMatchesFromPropsList = function aggMatchesFromPropsList2(propsLi
   }, {});
   const res = propsList.filter((props) => usefulObject(props[propName])).reduce((result, next) => {
     REQUEST_META.forEach((key) => {
-      var _prop;
       const prop = next[propName];
-      if (((_prop = prop) === null || _prop === void 0 ? void 0 : _prop.hasOwnProperty(key)) && usefulObject(prop[key])) {
+      if ((prop === null || prop === void 0 ? void 0 : prop.hasOwnProperty(key)) && usefulObject(prop[key])) {
         result[key] = Object.assign(result[key], prop[key]);
       }
     });

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

@@ -1,4 +1,4 @@
-import { serializeJson } from "@modern-js/utils/runtime-node";
+import { serializeJson } from "@modern-js/runtime-utils/node";
 import { attributesToString } from "../utils";
 import { buildTemplate } from "./buildTemplate.share";
 export function buildShellAfterTemplate(afterAppTemplate, options) {
@@ -11,7 +11,7 @@ export function buildShellAfterTemplate(afterAppTemplate, options) {
     return template.replace("<!--<?- SSRDataScript ?>-->", ssrDataScript);
     function buildSSRDataScript() {
       const { context: { ssrContext, initialData, __i18nData__ }, renderLevel } = options;
-      const { request, enableUnsafeCtx, nonce } = ssrContext;
+      const { request, enableUnsafeCtx, nonce, tracker } = ssrContext;
       const unsafeContext = {
         headers: request.headers
       };
@@ -21,6 +21,9 @@ export function buildShellAfterTemplate(afterAppTemplate, options) {
           i18nData: __i18nData__
         },
         context: {
+          reporter: {
+            sessionId: tracker.sessionId
+          },
           request: {
             params: request.params,
             query: request.query,

package/dist/esm-node/ssr/serverRender/renderToStream/bulidTemplate.before.js

@@ -1,5 +1,5 @@
 import ReactHelmet from "react-helmet";
-import { matchRoutes } from "@modern-js/utils/runtime/router";
+import { matchRoutes } from "@modern-js/runtime-utils/router";
 import helmetReplace from "../helmet";
 import { CSS_CHUNKS_PLACEHOLDER } from "../utils";
 import { HEAD_REG_EXP, buildTemplate } from "./buildTemplate.share";
@@ -20,7 +20,6 @@ function getHeadTemplate(beforeEntryTemplate, context) {
   function injectCss(headTemplate2) {
     return headTemplate2.replace(CSS_CHUNKS_PLACEHOLDER, getCssChunks());
     function getCssChunks() {
-      var _matches;
       const { routeManifest, routerContext, routes } = context;
       if (!routeManifest || !routerContext || !routes) {
         return "";
@@ -28,7 +27,7 @@ function getHeadTemplate(beforeEntryTemplate, context) {
       const { routeAssets } = routeManifest;
       const cssChunks = [];
       const matches = matchRoutes(routes, routerContext.location, routerContext.basename);
-      (_matches = matches) === null || _matches === void 0 ? void 0 : _matches.forEach((match, index) => {
+      matches === null || matches === void 0 ? void 0 : matches.forEach((match, index) => {
         if (!index) {
           return;
         }
@@ -37,10 +36,7 @@ function getHeadTemplate(beforeEntryTemplate, context) {
           const routeManifest2 = routeAssets[routeId];
           if (routeManifest2) {
             const { referenceCssAssets = [] } = routeManifest2;
-            const _cssChunks = referenceCssAssets.filter((asset) => {
-              var _asset;
-              return ((_asset = asset) === null || _asset === void 0 ? void 0 : _asset.endsWith(".css")) && !headTemplate2.includes(asset);
-            });
+            const _cssChunks = referenceCssAssets.filter((asset) => (asset === null || asset === void 0 ? void 0 : asset.endsWith(".css")) && !headTemplate2.includes(asset));
             cssChunks.push(..._cssChunks);
           }
         }

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

@@ -1,7 +1,8 @@
 import { createElement } from "react";
-import { run } from "@modern-js/utils/runtime-node";
-import { time } from "@modern-js/utils/universal/time";
+import { run } from "@modern-js/runtime-utils/node";
+import { time } from "@modern-js/runtime-utils/time";
 import { PreRender } from "../../react/prerender";
+import { SSRErrors, SSRTimings } from "../tracker";
 import renderToPipe from "./renderToPipe";
 export const render = ({ App, context }) => {
   const { ssrContext } = context;
@@ -15,17 +16,25 @@ export const render = ({ App, context }) => {
         ssr: true
       })
     });
+    const { tracker } = ssrContext;
     const pipe = renderToPipe(rootElement, context, {
       onShellReady() {
         const cacheConfig = PreRender.config();
         if (cacheConfig) {
           ssrContext.cacheConfig = cacheConfig;
         }
+        const cost = end();
+        tracker.trackTiming(SSRTimings.SSR_RENDER_SHELL, cost);
       },
       onAllReady() {
         const cost = end();
-        ssrContext.logger.debug("App Render To HTML cost = %d ms", cost);
-        ssrContext.metrics.emitTimer("app.render.html.cost", cost);
+        tracker.trackTiming(SSRTimings.SSR_RENDER_TOTAL, cost);
+      },
+      onShellError(e) {
+        tracker.trackError(SSRErrors.RENDER_SHELL, e);
+      },
+      onError(error) {
+        tracker.trackError(SSRErrors.RENDER_STREAM, error);
       }
     });
     return pipe;

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

@@ -13,7 +13,6 @@ function renderToPipe(rootElement, context, options) {
   const chunkVec = [];
   const forUserPipe = (stream) => {
     return new Promise((resolve) => {
-      var _ssrContext;
       let renderToPipeableStream;
       try {
         ({ renderToPipeableStream } = require("react-dom/server"));
@@ -21,11 +20,11 @@ function renderToPipe(rootElement, context, options) {
       }
       const { pipe } = renderToPipeableStream(rootElement, {
         ...options,
-        nonce: (_ssrContext = ssrContext) === null || _ssrContext === void 0 ? void 0 : _ssrContext.nonce,
+        nonce: ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.nonce,
         onShellReady() {
-          var _options_onShellReady, _options;
+          var _options_onShellReady;
           const { shellAfter, shellBefore } = getTemplates(context, RenderLevel.SERVER_RENDER);
-          (_options = options) === null || _options === void 0 ? void 0 : (_options_onShellReady = _options.onShellReady) === null || _options_onShellReady === void 0 ? void 0 : _options_onShellReady.call(_options);
+          options === null || options === void 0 ? void 0 : (_options_onShellReady = options.onShellReady) === null || _options_onShellReady === void 0 ? void 0 : _options_onShellReady.call(options);
           const injectableTransform = new Transform({
             transform(chunk, _encoding, callback) {
               try {
@@ -53,18 +52,11 @@ function renderToPipe(rootElement, context, options) {
           resolve(pipe(injectableTransform).pipe(stream));
         },
         onShellError(error) {
-          var _options_onShellError, _options;
-          ssrContext.metrics.emitCounter("app.render.streaming.shell.error", 1);
+          var _options_onShellError;
           const { shellAfter, shellBefore } = getTemplates(context, RenderLevel.CLIENT_RENDER);
           const fallbackHtml = `${shellBefore}${shellAfter}`;
           resolve(fallbackHtml);
-          (_options = options) === null || _options === void 0 ? void 0 : (_options_onShellError = _options.onShellError) === null || _options_onShellError === void 0 ? void 0 : _options_onShellError.call(_options, error);
-        },
-        onError(error) {
-          var _options_onError, _options;
-          ssrContext.logger.error("An error occurs during streaming SSR", error);
-          ssrContext.metrics.emitCounter("app.render.streaming.error", 1);
-          (_options = options) === null || _options === void 0 ? void 0 : (_options_onError = _options.onError) === null || _options_onError === void 0 ? void 0 : _options_onError.call(_options, error);
+          options === null || options === void 0 ? void 0 : (_options_onShellError = options.onShellError) === null || _options_onShellError === void 0 ? void 0 : _options_onShellError.call(options, error);
         }
       });
     });

package/dist/esm-node/ssr/serverRender/renderToStream/renderToPipe.worker.js

@@ -1,5 +1,6 @@
 import { RenderLevel } from "../types";
 import { ESCAPED_SHELL_STREAM_END_MARK } from "../../../common";
+import { SSRErrors } from "../tracker";
 import { getTemplates } from "./template";
 var ShellChunkStatus;
 (function(ShellChunkStatus2) {
@@ -18,15 +19,12 @@ function renderToPipe(rootElement, context, options) {
     }
     const { shellAfter, shellBefore } = getTemplates(context, RenderLevel.SERVER_RENDER);
     try {
-      var _ssrContext;
       const readableOriginal = await renderToReadableStream(rootElement, {
         ...options,
-        nonce: (_ssrContext = ssrContext) === null || _ssrContext === void 0 ? void 0 : _ssrContext.nonce,
+        nonce: ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.nonce,
         onError(error) {
-          var _ssrContext2, _ssrContext12, _options_onError, _options;
-          (_ssrContext2 = ssrContext) === null || _ssrContext2 === void 0 ? void 0 : _ssrContext2.logger.error("An error occurs during streaming SSR", error);
-          (_ssrContext12 = ssrContext) === null || _ssrContext12 === void 0 ? void 0 : _ssrContext12.metrics.emitCounter("app.render.streaming.error", 1);
-          (_options = options) === null || _options === void 0 ? void 0 : (_options_onError = _options.onError) === null || _options_onError === void 0 ? void 0 : _options_onError.call(_options, error);
+          var _options_onError;
+          options === null || options === void 0 ? void 0 : (_options_onError = options.onError) === null || _options_onError === void 0 ? void 0 : _options_onError.call(options, error);
         }
       });
       const reader = readableOriginal.getReader();
@@ -57,8 +55,7 @@ function renderToPipe(rootElement, context, options) {
       });
       return injectableStream;
     } catch (err) {
-      var _ssrContext1;
-      (_ssrContext1 = ssrContext) === null || _ssrContext1 === void 0 ? void 0 : _ssrContext1.metrics.emitCounter("app.render.streaming.shell.error", 1);
+      ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.tracker.trackError(SSRErrors.RENDER_SHELL, err);
       const { shellAfter: shellAfter2, shellBefore: shellBefore2 } = getTemplates(context, RenderLevel.CLIENT_RENDER);
       const fallbackHtml = `${shellBefore2}${shellAfter2}`;
       return fallbackHtml;

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

@@ -1,14 +1,14 @@
 import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import React from "react";
-import { serializeJson } from "@modern-js/utils/runtime-node";
+import { serializeJson } from "@modern-js/runtime-utils/node";
 import ReactHelmet from "react-helmet";
-import { time } from "@modern-js/utils/universal/time";
+import { time } from "@modern-js/runtime-utils/time";
 import { serializeErrors } from "../../../router/runtime/utils";
 import helmetReplace from "../helmet";
 import { RenderLevel } from "../types";
 import prefetch from "../../prefetch";
 import { ROUTER_DATA_JSON_ID, SSR_DATA_JSON_ID, attributesToString } from "../utils";
-import { SSRErrors, SSRTimings, createSSRTracker } from "../tracker";
+import { SSRErrors, SSRTimings } from "../tracker";
 import { createLoadableCollector } from "./loadable";
 import { createRender } from "./render";
 import { createStyledCollector } from "./styledComponent";
@@ -141,7 +141,7 @@ class Entry {
     this.entryName = entryName;
     this.App = options.App;
     this.pluginConfig = config;
-    this.tracker = createSSRTracker(ctx);
+    this.tracker = ctx.tracker;
     this.metrics = ctx.metrics;
     this.htmlModifiers = ctx.htmlModifiers;
     this.nonce = nonce;

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

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

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

@@ -2,11 +2,10 @@ import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { ChunkExtractor } from "@loadable/server";
 import { attributesToString, getLoadableScripts } from "../utils";
 const extname = (uri) => {
-  var _uri;
   if (typeof uri !== "string" || !uri.includes(".")) {
     return "";
   }
-  return `.${(_uri = uri) === null || _uri === void 0 ? void 0 : _uri.split(".").pop()}` || "";
+  return `.${uri === null || uri === void 0 ? void 0 : uri.split(".").pop()}` || "";
 };
 class LoadableCollector {
   collect(comopnent) {
@@ -30,35 +29,47 @@ class LoadableCollector {
     const { extractor } = this;
     const chunks = extractor.getChunkAssets(extractor.chunks);
     chunksMap.js = (chunksMap.js || "") + getLoadableScripts(extractor);
+    const attributes = this.generateAttributes();
     for (const v of chunks) {
-      const fileType = extname(v.url).slice(1);
-      const attributes = {};
-      const { crossorigin, scriptLoading = "defer" } = config;
-      if (crossorigin) {
-        attributes.crossorigin = crossorigin === true ? "anonymous" : crossorigin;
-      }
-      switch (scriptLoading) {
-        case "defer":
-          attributes.defer = true;
-          break;
-        case "module":
-          attributes.type = "module";
-          break;
-        default:
+      if (!v.url) {
+        continue;
       }
+      const fileType = extname(v.url).slice(1);
       if (fileType === "js") {
         const jsChunkReg = new RegExp(`<script .*src="${v.url}".*>`);
         if (!jsChunkReg.test(template)) {
+          const { scriptLoading = "defer" } = config;
+          switch (scriptLoading) {
+            case "defer":
+              attributes.defer = true;
+              break;
+            case "module":
+              attributes.type = "module";
+              break;
+            default:
+          }
           attributes.nonce = nonce;
           const attrsStr = attributesToString(attributes);
           chunksMap[fileType] += `<script${attrsStr} src="${v.url}"></script>`;
         }
       } else if (fileType === "css") {
-        const attrsStr = attributesToString(attributes);
-        chunksMap[fileType] += `<link${attrsStr} href="${v.url}" rel="stylesheet" />`;
+        const cssChunkReg = new RegExp(`<link .*href="${v.url}".*>`);
+        if (!cssChunkReg.test(template)) {
+          const attrsStr = attributesToString(attributes);
+          chunksMap[fileType] += `<link${attrsStr} href="${v.url}" rel="stylesheet" />`;
+        }
       }
     }
   }
+  generateAttributes() {
+    const { config } = this.options;
+    const { crossorigin } = config;
+    const attributes = {};
+    if (crossorigin) {
+      attributes.crossorigin = crossorigin === true ? "anonymous" : crossorigin;
+    }
+    return attributes;
+  }
   constructor(options) {
     _define_property(this, "options", void 0);
     _define_property(this, "extractor", void 0);

package/dist/esm-node/ssr/serverRender/tracker.js

@@ -3,11 +3,14 @@ export var SSRTimings;
   SSRTimings2[SSRTimings2["SSR_RENDER_TOTAL"] = 0] = "SSR_RENDER_TOTAL";
   SSRTimings2[SSRTimings2["SSR_PREFETCH"] = 1] = "SSR_PREFETCH";
   SSRTimings2[SSRTimings2["SSR_RENDER_HTML"] = 2] = "SSR_RENDER_HTML";
+  SSRTimings2[SSRTimings2["SSR_RENDER_SHELL"] = 3] = "SSR_RENDER_SHELL";
 })(SSRTimings || (SSRTimings = {}));
 export var SSRErrors;
 (function(SSRErrors2) {
   SSRErrors2[SSRErrors2["PREFETCH"] = 0] = "PREFETCH";
   SSRErrors2[SSRErrors2["RENDER_HTML"] = 1] = "RENDER_HTML";
+  SSRErrors2[SSRErrors2["RENDER_STREAM"] = 2] = "RENDER_STREAM";
+  SSRErrors2[SSRErrors2["RENDER_SHELL"] = 3] = "RENDER_SHELL";
 })(SSRErrors || (SSRErrors = {}));
 const errors = {
   [SSRErrors.PREFETCH]: {
@@ -19,6 +22,14 @@ const errors = {
     reporter: "SSR Error - App Render To HTML",
     logger: "App Render To HTML",
     metrics: "app.render.html.error"
+  },
+  [SSRErrors.RENDER_STREAM]: {
+    reporter: "SSR Error - App Render To Streaming",
+    logger: "An error occurs during streaming SSR",
+    metrics: "app.render.streaming.error"
+  },
+  [SSRErrors.RENDER_SHELL]: {
+    metrics: "app.render.streaming.shell.error"
   }
 };
 const timings = {
@@ -39,6 +50,9 @@ const timings = {
     serverTiming: "ssr-render-total",
     metrics: "app.render.cost",
     logger: "App Render Total cost = %d ms"
+  },
+  [SSRTimings.SSR_RENDER_SHELL]: {
+    reporter: "ssr-render-shell"
   }
 };
 export function createSSRTracker({ reporter, serverTiming, metrics, logger }) {

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { LinkProps as RouterLinkProps, NavLinkProps as RouterNavLinkProps } from '@modern-js/utils/runtime/router';
+import { LinkProps as RouterLinkProps, NavLinkProps as RouterNavLinkProps } from '@modern-js/runtime-utils/router';
 export declare function composeEventHandlers<EventType extends React.SyntheticEvent | Event>(theirHandler: ((event: EventType) => any) | undefined, ourHandler: (event: EventType) => any): (event: EventType) => any;
 /**
  * Modified from https://github.com/remix-run/remix/blob/9a0601bd704d2f3ee622e0ddacab9b611eb0c5bc/packages/remix-react/components.tsx#L218

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

@@ -1,3 +1,3 @@
-import { RouteObject } from '@modern-js/utils/runtime/router';
+import { RouteObject } from '@modern-js/runtime-utils/router';
 declare const modifyRoutes: import("@modern-js/plugin").Waterfall<RouteObject[]>;
 export { modifyRoutes };

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

@@ -1,7 +1,8 @@
-import { useRouteLoaderData as useRouteData } from '@modern-js/utils/runtime/router';
+import { useRouteLoaderData as useRouteData } from '@modern-js/runtime-utils/router';
 import { routerPlugin } from './plugin';
 import type { SingleRouteConfig, RouterConfig } from './types';
 export type { SingleRouteConfig, RouterConfig };
+export { renderRoutes } from './utils';
 export default routerPlugin;
 export { modifyRoutes } from './plugin';
 export * from './withRouter';
@@ -9,5 +10,5 @@ export { Link, NavLink } from './PrefetchLink';
 export type { LinkProps, NavLinkProps } from './PrefetchLink';
 export declare const useRouteLoaderData: typeof useRouteData;
 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';
+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/runtime-utils/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/runtime-utils/router';

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

@@ -1 +1 @@
-export * from '@modern-js/utils/runtime-node/router';
+export * from '@modern-js/runtime-utils/node/router';

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

@@ -1,7 +1,7 @@
 /// <reference types="react" />
-import type { RouteProps, RouteObject, Params } from '@modern-js/utils/runtime/router';
+import type { RouteProps, RouteObject, Params } from '@modern-js/runtime-utils/router';
 import { PageRoute, NestedRoute } from '@modern-js/types';
-import type { RequestContext } from '@modern-js/utils/runtime-node';
+import type { RequestContext } from '@modern-js/runtime-utils/node';
 declare global {
   interface Window {
     _SERVER_DATA?: {

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

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

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { useLocation, useNavigate } from '@modern-js/utils/runtime/router';
+import { useLocation, useNavigate } from '@modern-js/runtime-utils/router';
 export interface WithRouterProps {
   location: ReturnType<typeof useLocation>;
   params: Record<string, string>;

package/dist/types/runtimeContext.d.ts

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

package/dist/types/ssr/serverRender/renderToString/entry.d.ts

@@ -1,6 +1,6 @@
-import { RuntimeContext, ModernSSRReactComponent, SSRPluginConfig } from '../types';
+import { RuntimeContext, ModernSSRReactComponent, SSRPluginConfig, SSRServerContext } from '../types';
 import { SSRTracker } from '../tracker';
-import { SSRServerContext, RenderResult } from './type';
+import { RenderResult } from './type';
 type EntryOptions = {
   ctx: SSRServerContext;
   App: ModernSSRReactComponent;

package/dist/types/ssr/serverRender/renderToString/loadable.d.ts

@@ -8,6 +8,7 @@ declare class LoadableCollector implements Collector {
   constructor(options: LoadableCollectorOptions);
   collect(comopnent: ReactElement): ReactElement;
   effect(): void;
+  private generateAttributes;
 }
 export interface LoadableCollectorOptions {
   nonce?: string;

package/dist/types/ssr/serverRender/renderToString/type.d.ts

@@ -1,18 +1,8 @@
-import type { BaseSSRServerContext } from '@modern-js/types';
-import type { BuildHtmlCb } from './buildHtml';
 export declare enum RenderLevel {
   CLIENT_RENDER = 0,
   SERVER_PREFETCH = 1,
   SERVER_RENDER = 2,
 }
-export type SSRServerContext = BaseSSRServerContext & {
-  request: BaseSSRServerContext['request'] & {
-    userAgent: string;
-    cookie: string;
-    cookieMap: Record<string, string>;
-  };
-  htmlModifiers: BuildHtmlCb[];
-};
 export type RenderResult = {
   renderLevel: RenderLevel;
   html?: string;

package/dist/types/ssr/serverRender/tracker.d.ts

@@ -1,20 +1,23 @@
-import { SSRServerContext } from './types';
+import type { BaseSSRServerContext } from '@modern-js/types';
 export type SSRTracker = ReturnType<typeof createSSRTracker>;
 export declare enum SSRTimings {
   SSR_RENDER_TOTAL = 0,
   SSR_PREFETCH = 1,
   SSR_RENDER_HTML = 2,
+  SSR_RENDER_SHELL = 3,
 }
 export declare enum SSRErrors {
   PREFETCH = 0,
   RENDER_HTML = 1,
+  RENDER_STREAM = 2,
+  RENDER_SHELL = 3,
 }
 export declare function createSSRTracker({
   reporter,
   serverTiming,
   metrics,
   logger
-}: SSRServerContext): {
+}: BaseSSRServerContext): {
   readonly sessionId: string | undefined;
   trackError(key: SSRErrors, e: Error): void;
   trackTiming(key: SSRTimings, cost: number): void;

package/dist/types/ssr/serverRender/types.d.ts

@@ -1,8 +1,19 @@
 /// <reference types="react" />
 import { ServerUserConfig } from '@modern-js/app-tools';
+import type { BaseSSRServerContext } from '@modern-js/types';
 import type { RuntimeContext } from '../../core';
 import { RenderLevel } from './renderToString/type';
-export type { SSRServerContext } from './renderToString/type';
+import type { BuildHtmlCb } from './renderToString/buildHtml';
+import type { SSRTracker } from './tracker';
+export type SSRServerContext = BaseSSRServerContext & {
+  request: BaseSSRServerContext['request'] & {
+    userAgent: string;
+    cookie: string;
+    cookieMap: Record<string, string>;
+  };
+  htmlModifiers: BuildHtmlCb[];
+  tracker: SSRTracker;
+};
 export type ModernSSRReactComponent = React.ComponentType<any>;
 export { RuntimeContext, RenderLevel };
 export type SSRPluginConfig = {

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.34.0",
+  "version": "2.35.1",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -173,9 +173,10 @@
     "redux-logger": "^3.0.6",
     "styled-components": "^5.3.1",
     "@swc/helpers": "0.5.1",
-    "@modern-js/plugin": "2.34.0",
-    "@modern-js/types": "2.34.0",
-    "@modern-js/utils": "2.34.0"
+    "@modern-js/plugin": "2.35.1",
+    "@modern-js/types": "2.35.1",
+    "@modern-js/utils": "2.35.1",
+    "@modern-js/runtime-utils": "2.35.1"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -196,11 +197,11 @@
     "ts-jest": "^29.1.0",
     "typescript": "^5",
     "webpack": "^5.88.1",
-    "@modern-js/app-tools": "2.34.0",
-    "@modern-js/core": "2.34.0",
-    "@modern-js/server-core": "2.34.0",
-    "@scripts/build": "2.34.0",
-    "@scripts/jest-config": "2.34.0"
+    "@modern-js/app-tools": "2.35.1",
+    "@modern-js/core": "2.35.1",
+    "@modern-js/server-core": "2.35.1",
+    "@scripts/build": "2.35.1",
+    "@scripts/jest-config": "2.35.1"
   },
   "sideEffects": false,
   "publishConfig": {