@modern-js/runtime 2.34.0 → 2.35.1

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,9 +37,8 @@ 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
@@ -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]

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) {
   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:
@@ -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);
     });
   }
@@ -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;
       }

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

@@ -1,5 +1,6 @@
-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";
 export * from "./withRouter";
@@ -65,4 +66,4 @@ export {
   defer,
   json,
   redirect
-} from "@modern-js/utils/runtime/router";
+} from "@modern-js/runtime-utils/router";

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

@@ -3,9 +3,9 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 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";
@@ -56,7 +56,6 @@ export var routerPlugin = function(param) {
         },
         hoc: function(param2, next) {
           var App = param2.App;
-          var _routesConfig;
           if (!finalRouteConfig && !createRoutes) {
             return next({
               App: App
@@ -71,8 +70,7 @@ export var routerPlugin = function(param) {
               var runtimeContext = useContext(RuntimeReactContext);
               var getBlockNavState = runtimeContext.unstable_getBlockNavState;
               return useMemo(function() {
-                var _hydrationData;
-                if ((_hydrationData = hydrationData) === null || _hydrationData === void 0 ? void 0 : _hydrationData.errors) {
+                if (hydrationData === null || hydrationData === void 0 ? void 0 : hydrationData.errors) {
                   hydrationData = _object_spread_props(_object_spread({}, hydrationData), {
                     errors: deserializeErrors(hydrationData.errors)
                   });
@@ -133,7 +131,7 @@ export var routerPlugin = function(param) {
           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)
             });

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

@@ -6,12 +6,12 @@ import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 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";
@@ -157,7 +157,6 @@ export var routerPlugin = function(param) {
         },
         hoc: function(param2, next) {
           var App = param2.App;
-          var _routesConfig;
           if (!routesConfig) {
             return next({
               App: App
@@ -176,7 +175,7 @@ export var routerPlugin = function(param) {
             };
           };
           var 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)
             });

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

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

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

@@ -4,9 +4,9 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { jsx as _jsx } from "react/jsx-runtime";
-import { Route, isRouteErrorResponse } from "@modern-js/utils/runtime/router";
-import { ErrorResponse } from "@modern-js/utils/runtime/remix-router";
-import { renderNestedRoute } from "@modern-js/utils/runtime/nested-routes";
+import { Route, isRouteErrorResponse } from "@modern-js/runtime-utils/router";
+import { ErrorResponse } from "@modern-js/runtime-utils/remix-router";
+import { renderNestedRoute } from "@modern-js/runtime-utils/browser";
 import { DefaultNotFound } from "./DefaultNotFound";
 import DeferredDataScripts from "./DeferredDataScripts";
 export function getRouteComponents(routes, param) {
@@ -83,9 +83,9 @@ export function renderRoutes(param) {
   return routeElements;
 }
 export function getLocation(serverContext) {
-  var _serverContext, _url_replace, _url;
-  var _ref = ((_serverContext = serverContext) === null || _serverContext === void 0 ? void 0 : _serverContext.request) || {}, pathname = _ref.pathname, url = _ref.url;
-  var cleanUrl = (_url = url) === null || _url === void 0 ? void 0 : (_url_replace = _url.replace("http://", "")) === null || _url_replace === void 0 ? void 0 : _url_replace.replace("https://", "");
+  var _url_replace;
+  var _ref = (serverContext === null || serverContext === void 0 ? void 0 : serverContext.request) || {}, pathname = _ref.pathname, url = _ref.url;
+  var cleanUrl = url === null || url === void 0 ? void 0 : (_url_replace = url.replace("http://", "")) === null || _url_replace === void 0 ? void 0 : _url_replace.replace("https://", "");
   var index = (cleanUrl || "").indexOf(pathname);
   if (index === -1) {
     return pathname;

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

@@ -1,7 +1,7 @@
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useLocation, useNavigate, useParams } from "@modern-js/utils/runtime/router";
+import { useLocation, useNavigate, useParams } from "@modern-js/runtime-utils/router";
 export var withRouter = function(Component) {
   return function(props) {
     var location = useLocation();

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

@@ -4,15 +4,14 @@ import path from "path";
 import { getEntryOptions, SERVER_RENDER_FUNCTION_NAME, LOADABLE_STATS_FILE, isUseSSRBundle, createRuntimeExportsUtils, isSSGEntry } from "@modern-js/utils";
 var PLUGIN_IDENTIFIER = "ssr";
 var hasStringSSREntry = function(userConfig) {
-  var _server, _server1;
   var isStreaming = function(ssr) {
     return ssr && typeof ssr === "object" && ssr.mode === "stream";
   };
   var server = userConfig.server, output = userConfig.output;
-  if ((((_server = server) === null || _server === void 0 ? void 0 : _server.ssr) || output.ssg) && !isStreaming(server.ssr)) {
+  if (((server === null || server === void 0 ? void 0 : server.ssr) || output.ssg) && !isStreaming(server.ssr)) {
     return true;
   }
-  if (((_server1 = server) === null || _server1 === void 0 ? void 0 : _server1.ssrByEntries) && typeof server.ssrByEntries === "object") {
+  if ((server === null || server === void 0 ? void 0 : server.ssrByEntries) && typeof server.ssrByEntries === "object") {
     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
     try {
       for (var _iterator = Object.keys(server.ssrByEntries)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
@@ -39,9 +38,8 @@ var hasStringSSREntry = function(userConfig) {
   return false;
 };
 var checkUseStringSSR = function(config) {
-  var _output;
   var output = config.output;
-  return Boolean((_output = output) === null || _output === void 0 ? void 0 : _output.ssg) || hasStringSSREntry(config);
+  return Boolean(output === null || output === void 0 ? void 0 : output.ssg) || hasStringSSREntry(config);
 };
 export var ssrPlugin = function() {
   return {
@@ -85,8 +83,8 @@ export var ssrPlugin = function() {
           return {
             source: {
               alias: {
-                // 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"),
+                // ensure that all packages use the same storage in @modern-js/runtime-utils/node
+                "@modern-js/runtime-utils/node$": require.resolve("@modern-js/runtime-utils/node"),
                 "@modern-js/runtime/plugins": pluginsExportsUtils.getPath()
               },
               globalVars: function(values, param) {
@@ -119,9 +117,9 @@ export var ssrPlugin = function() {
           pluginsExportsUtils.addExport("export { default as ssr } from '@modern-js/runtime/ssr'");
           var ssrConfig = getEntryOptions(entryName, isMainEntry, userConfig.server.ssr, userConfig.server.ssrByEntries, packageName);
           if (typeof ssrConfig === "object" && ssrConfig.mode === "stream") {
-            var _this, _runtimeConfig;
+            var _this;
             var runtimeConfig = getEntryOptions(entryName, isMainEntry, userConfig.runtime, userConfig.runtimeByEntries, packageName);
-            if (((_this = (_runtimeConfig = runtimeConfig) === null || _runtimeConfig === void 0 ? void 0 : _runtimeConfig.router) === null || _this === void 0 ? void 0 : _this.mode) === "react-router-5") {
+            if (((_this = runtimeConfig === null || runtimeConfig === void 0 ? void 0 : runtimeConfig.router) === null || _this === void 0 ? void 0 : _this.mode) === "react-router-5") {
               throw new Error("router v5 plugin doesn't support streaming SSR, check your config 'runtime.router'");
             }
             if (fileSystemRoutes && !entrypoint.nestedRoutesEntry) {
@@ -148,8 +146,8 @@ export var ssrPlugin = function() {
         modifyEntryRuntimePlugins: function modifyEntryRuntimePlugins(param) {
           var entrypoint = param.entrypoint, plugins = param.plugins, bundlerConfigs = param.bundlerConfigs;
           if (ssrConfigMap.get(entrypoint.entryName)) {
-            var _bundlerConfigs_find_output, _bundlerConfigs_find, _bundlerConfigs, _config_server;
-            var chunkLoadingGlobal = (_bundlerConfigs = bundlerConfigs) === null || _bundlerConfigs === void 0 ? void 0 : (_bundlerConfigs_find = _bundlerConfigs.find(function(config2) {
+            var _bundlerConfigs_find_output, _bundlerConfigs_find, _config_server;
+            var chunkLoadingGlobal = bundlerConfigs === null || bundlerConfigs === void 0 ? void 0 : (_bundlerConfigs_find = bundlerConfigs.find(function(config2) {
               return config2.name === "client";
             })) === null || _bundlerConfigs_find === void 0 ? void 0 : (_bundlerConfigs_find_output = _bundlerConfigs_find.output) === null || _bundlerConfigs_find_output === void 0 ? void 0 : _bundlerConfigs_find_output.chunkLoadingGlobal;
             var config = api.useResolvedConfigContext();

package/dist/esm/ssr/index.js

@@ -5,7 +5,7 @@ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 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-browser";
+import { parsedJSONFromElement } from "@modern-js/runtime-utils/browser";
 import { RenderLevel } from "./serverRender/types";
 import { WithCallback } from "./react/withCallback";
 import { formatClient, mockResponse, isReact18 } from "./utils";

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

@@ -4,6 +4,7 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { formatServer } from "./utils";
 import render from "./serverRender";
+import { createSSRTracker } from "./serverRender/tracker";
 export var ssr = function() {
   var config = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
   return {
@@ -43,6 +44,7 @@ export var ssr = function() {
           var request = context.ssrContext.request;
           context.ssrContext.request = formatServer(request);
           context.ssrContext.mode = config.mode;
+          context.ssrContext.tracker = createSSRTracker(context.ssrContext);
           if (!context.ssrContext.htmlModifiers) {
             context.ssrContext.htmlModifiers = [];
           }
@@ -52,8 +54,7 @@ export var ssr = function() {
         },
         pickContext: function(param, next) {
           var context = param.context, pickedContext = param.pickedContext;
-          var _context;
-          var _ref = (_context = context) === null || _context === void 0 ? void 0 : _context.ssrContext, request = _ref.request, response = _ref.response;
+          var _ref = context === null || context === void 0 ? void 0 : context.ssrContext, request = _ref.request, response = _ref.response;
           var initialData = context.initialData;
           return next({
             context: context,

package/dist/esm/ssr/prefetch.js

@@ -2,7 +2,7 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 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";
 var prefetch = function() {
   var _ref = _async_to_generator(function(App, context, config) {
@@ -10,7 +10,7 @@ var prefetch = function() {
       return [
         2,
         run(context.ssrContext.request.headers, /* @__PURE__ */ _async_to_generator(function() {
-          var _context_store, _context, ssrContext, loadableStats, extractor, loadersData;
+          var _context_store, ssrContext, loadableStats, extractor, loadersData;
           return _ts_generator(this, function(_state2) {
             switch (_state2.label) {
               case 0:
@@ -63,7 +63,7 @@ var prefetch = function() {
                     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()
                   }
                 ];
             }

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

@@ -46,9 +46,8 @@ export var aggKeysFromPropsList = function aggKeysFromPropsList2(propsList, prop
     return usefulObject(props[propName]);
   }).reduce(function(result, next) {
     REQUEST_META.forEach(function(key) {
-      var _prop;
       var 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]));
       }
     });
@@ -73,9 +72,8 @@ export var aggMatchesFromPropsList = function aggMatchesFromPropsList2(propsList
     return usefulObject(props[propName]);
   }).reduce(function(result, next) {
     REQUEST_META.forEach(function(key) {
-      var _prop;
       var 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/ssr/serverRender/renderToStream/buildTemplate.after.js

@@ -1,5 +1,5 @@
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
-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) {
@@ -8,7 +8,7 @@ export function buildShellAfterTemplate(afterAppTemplate, options) {
     return template.replace("<!--<?- SSRDataScript ?>-->", ssrDataScript);
     function buildSSRDataScript() {
       var _options_context = options.context, ssrContext = _options_context.ssrContext, initialData = _options_context.initialData, __i18nData__ = _options_context.__i18nData__, renderLevel = options.renderLevel;
-      var request = ssrContext.request, enableUnsafeCtx = ssrContext.enableUnsafeCtx, nonce = ssrContext.nonce;
+      var request = ssrContext.request, enableUnsafeCtx = ssrContext.enableUnsafeCtx, nonce = ssrContext.nonce, tracker = ssrContext.tracker;
       var unsafeContext = {
         headers: request.headers
       };
@@ -18,6 +18,9 @@ export function buildShellAfterTemplate(afterAppTemplate, options) {
           i18nData: __i18nData__
         },
         context: {
+          reporter: {
+            sessionId: tracker.sessionId
+          },
           request: _object_spread({
             params: request.params,
             query: request.query,

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

@@ -1,7 +1,7 @@
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 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";
@@ -9,7 +9,6 @@ function getHeadTemplate(beforeEntryTemplate, context) {
   var injectCss = function injectCss2(headTemplate2) {
     return headTemplate2.replace(CSS_CHUNKS_PLACEHOLDER, getCssChunks());
     function getCssChunks() {
-      var _matches;
       var routeManifest = context.routeManifest, routerContext = context.routerContext, routes = context.routes;
       if (!routeManifest || !routerContext || !routes) {
         return "";
@@ -17,7 +16,7 @@ function getHeadTemplate(beforeEntryTemplate, context) {
       var routeAssets = routeManifest.routeAssets;
       var cssChunks = [];
       var matches = matchRoutes(routes, routerContext.location, routerContext.basename);
-      (_matches = matches) === null || _matches === void 0 ? void 0 : _matches.forEach(function(match, index) {
+      matches === null || matches === void 0 ? void 0 : matches.forEach(function(match, index) {
         if (!index) {
           return;
         }
@@ -28,8 +27,7 @@ function getHeadTemplate(beforeEntryTemplate, context) {
             var _cssChunks;
             var _routeManifest_referenceCssAssets = routeManifest2.referenceCssAssets, referenceCssAssets = _routeManifest_referenceCssAssets === void 0 ? [] : _routeManifest_referenceCssAssets;
             var _cssChunks1 = referenceCssAssets.filter(function(asset) {
-              var _asset;
-              return ((_asset = asset) === null || _asset === void 0 ? void 0 : _asset.endsWith(".css")) && !headTemplate2.includes(asset);
+              return (asset === null || asset === void 0 ? void 0 : asset.endsWith(".css")) && !headTemplate2.includes(asset);
             });
             (_cssChunks = cssChunks).push.apply(_cssChunks, _to_consumable_array(_cssChunks1));
           }

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

@@ -1,9 +1,10 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 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 var render = function(param) {
   var App = param.App, context = param.context;
@@ -12,7 +13,7 @@ export var render = function(param) {
     throw new Error('The "ssrContext" must not be undefined, but received undefined');
   }
   return run(ssrContext.request.headers, /* @__PURE__ */ _async_to_generator(function() {
-    var end, rootElement, pipe;
+    var end, rootElement, tracker, pipe;
     return _ts_generator(this, function(_state) {
       end = time();
       rootElement = createElement(App, {
@@ -20,17 +21,25 @@ export var render = function(param) {
           ssr: true
         })
       });
+      tracker = ssrContext.tracker;
       pipe = renderToPipe(rootElement, context, {
         onShellReady: function onShellReady() {
           var cacheConfig = PreRender.config();
           if (cacheConfig) {
             ssrContext.cacheConfig = cacheConfig;
           }
+          var cost = end();
+          tracker.trackTiming(SSRTimings.SSR_RENDER_SHELL, cost);
         },
         onAllReady: function onAllReady() {
           var 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: function onShellError(e) {
+          tracker.trackError(SSRErrors.RENDER_SHELL, e);
+        },
+        onError: function onError(error) {
+          tracker.trackError(SSRErrors.RENDER_STREAM, error);
         }
       });
       return [

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

@@ -16,18 +16,17 @@ function renderToPipe(rootElement, context, options) {
   var chunkVec = [];
   var forUserPipe = function(stream) {
     return new Promise(function(resolve) {
-      var _ssrContext;
       var renderToPipeableStream;
       try {
         renderToPipeableStream = require("react-dom/server").renderToPipeableStream;
       } catch (e) {
       }
       var pipe = renderToPipeableStream(rootElement, _object_spread_props(_object_spread({}, options), {
-        nonce: (_ssrContext = ssrContext) === null || _ssrContext === void 0 ? void 0 : _ssrContext.nonce,
+        nonce: ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.nonce,
         onShellReady: function onShellReady() {
-          var _options_onShellReady, _options;
+          var _options_onShellReady;
           var _getTemplates = getTemplates(context, RenderLevel.SERVER_RENDER), shellAfter = _getTemplates.shellAfter, shellBefore = _getTemplates.shellBefore;
-          (_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);
           var injectableTransform = new Transform({
             transform: function transform(chunk, _encoding, callback) {
               try {
@@ -55,18 +54,11 @@ function renderToPipe(rootElement, context, options) {
           resolve(pipe(injectableTransform).pipe(stream));
         },
         onShellError: function onShellError(error) {
-          var _options_onShellError, _options;
-          ssrContext.metrics.emitCounter("app.render.streaming.shell.error", 1);
+          var _options_onShellError;
           var _getTemplates = getTemplates(context, RenderLevel.CLIENT_RENDER), shellAfter = _getTemplates.shellAfter, shellBefore = _getTemplates.shellBefore;
           var fallbackHtml = "".concat(shellBefore).concat(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: function 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);
         }
       })).pipe;
     });

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

@@ -4,6 +4,7 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { RenderLevel } from "../types";
 import { ESCAPED_SHELL_STREAM_END_MARK } from "../../../common";
+import { SSRErrors } from "../tracker";
 import { getTemplates } from "./template";
 var ShellChunkStatus;
 (function(ShellChunkStatus2) {
@@ -16,7 +17,7 @@ function renderToPipe(rootElement, context, options) {
   var ssrContext = context.ssrContext;
   var forUserPipe = function() {
     var _ref = _async_to_generator(function() {
-      var renderToReadableStream, _getTemplates, shellAfter, shellBefore, _ssrContext, readableOriginal, reader, injectableStream, err, _ssrContext1, _getTemplates1, shellAfter1, shellBefore1, fallbackHtml;
+      var renderToReadableStream, _getTemplates, shellAfter, shellBefore, readableOriginal, reader, injectableStream, err, _getTemplates1, shellAfter1, shellBefore1, fallbackHtml;
       return _ts_generator(this, function(_state) {
         switch (_state.label) {
           case 0:
@@ -36,12 +37,10 @@ function renderToPipe(rootElement, context, options) {
             return [
               4,
               renderToReadableStream(rootElement, _object_spread_props(_object_spread({}, options), {
-                nonce: (_ssrContext = ssrContext) === null || _ssrContext === void 0 ? void 0 : _ssrContext.nonce,
+                nonce: ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.nonce,
                 onError: function 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);
                 }
               }))
             ];
@@ -101,7 +100,7 @@ function renderToPipe(rootElement, context, options) {
             ];
           case 3:
             err = _state.sent();
-            (_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);
             _getTemplates1 = getTemplates(context, RenderLevel.CLIENT_RENDER), shellAfter1 = _getTemplates1.shellAfter, shellBefore1 = _getTemplates1.shellBefore;
             fallbackHtml = "".concat(shellBefore1).concat(shellAfter1);
             return [

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

@@ -6,15 +6,15 @@ import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 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";
@@ -60,7 +60,7 @@ var Entry = /* @__PURE__ */ function() {
     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/ssr/serverRender/renderToString/index.js

@@ -1,7 +1,7 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-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";