@modern-js/runtime 2.28.0 → 2.29.0

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @modern-js/runtime
 
+## 2.29.0
+
+### Minor Changes
+
+- cba7675: feat: add a server reporter that report server cost, logger about error, info etc.
+  feat: 添加一个 server 端 reporter，来报告 server 端耗时，报错等
+
+### Patch Changes
+
+- 600bb0a: fix: fix remixRouter not existed in conventional routes
+  fix: 修复 remixRouter 在约定式路由下不存在问题
+- fd3e71c: fix: if a route dont has component, should be as a no-layout route
+  fix: 如果路由对象没有组件属性，应该被看做无布局路由
+- 9a81e31: fix(plugin-runtime): ssr reporter some problems
+  fix(plugin-runtime): ssr reporter 小问题
+- Updated dependencies [e6b5355]
+- Updated dependencies [93db783]
+- Updated dependencies [cba7675]
+- Updated dependencies [99052ea]
+- Updated dependencies [1d71d2e]
+  - @modern-js/utils@2.29.0
+  - @modern-js/types@2.29.0
+  - @modern-js/plugin@2.29.0
+
 ## 2.28.0
 
 ### Patch Changes

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

@@ -175,6 +175,7 @@ const documentPlugin = () => ({
               );
               const documentHtmlOptions = templateContent ? {
                 templateContent,
+                // Note: the behavior of inject/modify tags in afterTemplateExecution hook will not take effect
                 inject: false
               } : {};
               return {

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

@@ -148,6 +148,12 @@ const routerPlugin = ({ serverBase = [], supportHtml5History = true, basename =
         },
         pickContext: ({ context, pickedContext }, next) => {
           const { remixRouter } = context;
+          if (!remixRouter) {
+            return next({
+              context,
+              pickedContext
+            });
+          }
           const router = {
             navigate: remixRouter.navigate,
             get location() {

package/dist/cjs/ssr/serverRender/constants.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "ServerTimingNames", {
+  enumerable: true,
+  get: function() {
+    return ServerTimingNames;
+  }
+});
+var ServerTimingNames;
+(function(ServerTimingNames2) {
+  ServerTimingNames2["SSR_RENDER_TOTAL"] = "ssr-render-total";
+  ServerTimingNames2["SSR_PREFETCH"] = "ssr-prefetch";
+  ServerTimingNames2["SSR_RENDER_HTML"] = "ssr-render-html";
+})(ServerTimingNames || (ServerTimingNames = {}));

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

@@ -11,8 +11,8 @@ Object.defineProperty(exports, "render", {
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _react = require("react");
 const _runtimenode = require("@modern-js/utils/runtime-node");
+const _time = require("@modern-js/utils/universal/time");
 const _prerender = require("../../react/prerender");
-const _time = require("../time");
 const _renderToPipe = /* @__PURE__ */ _interop_require_default._(require("./renderToPipe"));
 const render = ({ App, context }) => {
   const { ssrContext } = context;

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

@@ -15,17 +15,19 @@ const _react = /* @__PURE__ */ _interop_require_default._(require("react"));
 const _server = /* @__PURE__ */ _interop_require_default._(require("react-dom/server"));
 const _runtimenode = require("@modern-js/utils/runtime-node");
 const _reacthelmet = /* @__PURE__ */ _interop_require_default._(require("react-helmet"));
+const _time = require("@modern-js/utils/universal/time");
 const _utils = require("../../../router/runtime/utils");
 const _helmet = /* @__PURE__ */ _interop_require_default._(require("../helmet"));
 const _types = require("../types");
-const _time = require("../time");
 const _prefetch = /* @__PURE__ */ _interop_require_default._(require("../../prefetch"));
 const _utils1 = require("../utils");
+const _reporter = require("../reporter");
+const _constants = require("../constants");
 const _template = require("./template");
 const _reduce = require("./reduce");
 const _loadable = /* @__PURE__ */ _interop_require_wildcard._(require("./loadable"));
 const _styledComponent = /* @__PURE__ */ _interop_require_wildcard._(require("./styledComponent"));
-const buildTemplateData = (context, data, renderLevel) => {
+const buildTemplateData = (context, data, renderLevel, reporter) => {
   const { request, enableUnsafeCtx } = context;
   const unsafeContext = {
     headers: request.headers
@@ -40,6 +42,9 @@ const buildTemplateData = (context, data, renderLevel) => {
         host: request.host,
         url: request.url,
         ...enableUnsafeCtx ? unsafeContext : {}
+      },
+      reporter: {
+        sessionId: reporter.sessionId
       }
     },
     renderLevel
@@ -68,7 +73,7 @@ class Entry {
       errors: (0, _utils.serializeErrors)(routerContext.errors)
     } : void 0;
     let html = "";
-    const templateData = buildTemplateData(ssrContext, prefetchData, this.result.renderLevel);
+    const templateData = buildTemplateData(ssrContext, prefetchData, this.result.renderLevel, this.reporter);
     const SSRData = this.getSSRDataScript(templateData, routerData);
     for (const fragment of this.fragments) {
       if (fragment.isVariable && fragment.content === "SSRDataScript") {
@@ -89,9 +94,12 @@ class Entry {
       const prefetchCost = end();
       this.logger.debug(`App Prefetch cost = %d ms`, prefetchCost);
       this.metrics.emitTimer("app.prefetch.cost", prefetchCost);
+      this.reporter.reportTime("app_prefetch_cost", prefetchCost);
+      this.severTiming.addServeTiming(_constants.ServerTimingNames.SSR_PREFETCH, prefetchCost);
     } catch (e) {
       this.result.renderLevel = _types.RenderLevel.CLIENT_RENDER;
       this.logger.error("App Prefetch Render", e);
+      this.reporter.reportError("App Prefetch Render", e);
       this.metrics.emitCounter("app.prefetch.render.error", 1);
     }
     return prefetchData || {};
@@ -123,9 +131,12 @@ class Entry {
       const cost = end();
       this.logger.debug("App Render To HTML cost = %d ms", cost);
       this.metrics.emitTimer("app.render.html.cost", cost);
+      this.reporter.reportTime("app_render_html_cost", cost);
+      this.severTiming.addServeTiming(_constants.ServerTimingNames.SSR_RENDER_HTML, cost);
       this.result.renderLevel = _types.RenderLevel.SERVER_RENDER;
     } catch (e) {
       this.logger.error("App Render To HTML", e);
+      this.reporter.reportError("App Render To HTML", e);
       this.metrics.emitCounter("app.render.html.error", 1);
     }
     return html;
@@ -152,6 +163,8 @@ class Entry {
     _define_property._(this, "result", void 0);
     _define_property._(this, "metrics", void 0);
     _define_property._(this, "logger", void 0);
+    _define_property._(this, "severTiming", void 0);
+    _define_property._(this, "reporter", void 0);
     _define_property._(this, "template", void 0);
     _define_property._(this, "App", void 0);
     _define_property._(this, "fragments", void 0);
@@ -166,6 +179,8 @@ class Entry {
     this.host = host;
     this.App = options.App;
     this.pluginConfig = config;
+    this.reporter = (0, _reporter.createSSRReporter)(ctx.reporter);
+    this.severTiming = ctx.serverTiming;
     this.metrics = ctx.metrics;
     this.logger = ctx.logger;
     this.nonce = nonce;

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

@@ -10,8 +10,9 @@ Object.defineProperty(exports, "render", {
 });
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _runtimenode = require("@modern-js/utils/runtime-node");
+const _time = require("@modern-js/utils/universal/time");
 const _prerender = require("../../react/prerender");
-const _time = require("../time");
+const _constants = require("../constants");
 const _entry = /* @__PURE__ */ _interop_require_default._(require("./entry"));
 const render = ({ App, context, config }) => {
   const ssrContext = context.ssrContext;
@@ -27,6 +28,8 @@ const render = ({ App, context, config }) => {
     const cost = end();
     entry.logger.info("App Render Total cost = %d ms", cost);
     entry.metrics.emitTimer("app.render.cost", cost);
+    entry.reporter.reportTime("app_render_cost", cost);
+    entry.severTiming.addServeTiming(_constants.ServerTimingNames.SSR_RENDER_TOTAL, cost);
     const cacheConfig = _prerender.PreRender.config();
     if (cacheConfig) {
       context.ssrContext.cacheConfig = cacheConfig;

package/dist/cjs/ssr/serverRender/reporter.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "createSSRReporter", {
+  enumerable: true,
+  get: function() {
+    return createSSRReporter;
+  }
+});
+function createSSRReporter(reporter) {
+  const _reporter = {
+    get sessionId() {
+      return reporter.sessionId;
+    },
+    get userId() {
+      return reporter.userId;
+    },
+    reportError(content, e) {
+      reporter.reportError(`SSR Error - ${content}`, e);
+    },
+    reportTime(name, cost) {
+      reporter.reportTiming(`ssr_${name}`, cost);
+    }
+  };
+  return _reporter;
+}

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

@@ -219,6 +219,7 @@ export var documentPlugin = function() {
                       );
                       var documentHtmlOptions = templateContent ? {
                         templateContent: templateContent,
+                        // Note: the behavior of inject/modify tags in afterTemplateExecution hook will not take effect
                         inject: false
                       } : {};
                       return _object_spread({}, options, documentHtmlOptions);

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

@@ -133,6 +133,12 @@ export var routerPlugin = function(param) {
         pickContext: function(param2, next) {
           var context = param2.context, pickedContext = param2.pickedContext;
           var remixRouter = context.remixRouter;
+          if (!remixRouter) {
+            return next({
+              context: context,
+              pickedContext: pickedContext
+            });
+          }
           var router = {
             navigate: remixRouter.navigate,
             get location() {

package/dist/esm/ssr/serverRender/constants.js

@@ -0,0 +1,6 @@
+export var ServerTimingNames;
+(function(ServerTimingNames2) {
+  ServerTimingNames2["SSR_RENDER_TOTAL"] = "ssr-render-total";
+  ServerTimingNames2["SSR_PREFETCH"] = "ssr-prefetch";
+  ServerTimingNames2["SSR_RENDER_HTML"] = "ssr-render-html";
+})(ServerTimingNames || (ServerTimingNames = {}));

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

@@ -2,8 +2,8 @@ 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 { PreRender } from "../../react/prerender";
-import { time } from "../time";
 import renderToPipe from "./renderToPipe";
 export var render = function(param) {
   var App = param.App, context = param.context;

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

@@ -8,17 +8,19 @@ import React from "react";
 import ReactDomServer from "react-dom/server";
 import { serializeJson } from "@modern-js/utils/runtime-node";
 import ReactHelmet from "react-helmet";
+import { time } from "@modern-js/utils/universal/time";
 import { serializeErrors } from "../../../router/runtime/utils";
 import helmetReplace from "../helmet";
 import { RenderLevel } from "../types";
-import { time } from "../time";
 import prefetch from "../../prefetch";
 import { ROUTER_DATA_JSON_ID, SSR_DATA_JSON_ID, attributesToString } from "../utils";
+import { createSSRReporter } from "../reporter";
+import { ServerTimingNames } from "../constants";
 import { toFragments } from "./template";
 import { reduce } from "./reduce";
 import * as loadableRenderer from "./loadable";
 import * as styledComponentRenderer from "./styledComponent";
-var buildTemplateData = function(context, data, renderLevel) {
+var buildTemplateData = function(context, data, renderLevel, reporter) {
   var request = context.request, enableUnsafeCtx = context.enableUnsafeCtx;
   var unsafeContext = {
     headers: request.headers
@@ -32,7 +34,10 @@ var buildTemplateData = function(context, data, renderLevel) {
         pathname: request.pathname,
         host: request.host,
         url: request.url
-      }, enableUnsafeCtx ? unsafeContext : {})
+      }, enableUnsafeCtx ? unsafeContext : {}),
+      reporter: {
+        sessionId: reporter.sessionId
+      }
     },
     renderLevel: renderLevel
   };
@@ -45,6 +50,8 @@ var Entry = /* @__PURE__ */ function() {
     _define_property(this, "result", void 0);
     _define_property(this, "metrics", void 0);
     _define_property(this, "logger", void 0);
+    _define_property(this, "severTiming", void 0);
+    _define_property(this, "reporter", void 0);
     _define_property(this, "template", void 0);
     _define_property(this, "App", void 0);
     _define_property(this, "fragments", void 0);
@@ -59,6 +66,8 @@ var Entry = /* @__PURE__ */ function() {
     this.host = host;
     this.App = options.App;
     this.pluginConfig = config;
+    this.reporter = createSSRReporter(ctx.reporter);
+    this.severTiming = ctx.serverTiming;
     this.metrics = ctx.metrics;
     this.logger = ctx.logger;
     this.nonce = nonce;
@@ -115,7 +124,7 @@ var Entry = /* @__PURE__ */ function() {
                   errors: serializeErrors(routerContext.errors)
                 } : void 0;
                 html = "";
-                templateData = buildTemplateData(ssrContext, prefetchData, _this.result.renderLevel);
+                templateData = buildTemplateData(ssrContext, prefetchData, _this.result.renderLevel, _this.reporter);
                 SSRData = _this.getSSRDataScript(templateData, routerData);
                 _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
                 try {
@@ -179,6 +188,8 @@ var Entry = /* @__PURE__ */ function() {
                 prefetchCost = end();
                 _this.logger.debug("App Prefetch cost = %d ms", prefetchCost);
                 _this.metrics.emitTimer("app.prefetch.cost", prefetchCost);
+                _this.reporter.reportTime("app_prefetch_cost", prefetchCost);
+                _this.severTiming.addServeTiming(ServerTimingNames.SSR_PREFETCH, prefetchCost);
                 return [
                   3,
                   4
@@ -187,6 +198,7 @@ var Entry = /* @__PURE__ */ function() {
                 e = _state.sent();
                 _this.result.renderLevel = RenderLevel.CLIENT_RENDER;
                 _this.logger.error("App Prefetch Render", e);
+                _this.reporter.reportError("App Prefetch Render", e);
                 _this.metrics.emitCounter("app.prefetch.render.error", 1);
                 return [
                   3,
@@ -233,9 +245,12 @@ var Entry = /* @__PURE__ */ function() {
           var cost = end();
           this.logger.debug("App Render To HTML cost = %d ms", cost);
           this.metrics.emitTimer("app.render.html.cost", cost);
+          this.reporter.reportTime("app_render_html_cost", cost);
+          this.severTiming.addServeTiming(ServerTimingNames.SSR_RENDER_HTML, cost);
           this.result.renderLevel = RenderLevel.SERVER_RENDER;
         } catch (e) {
           this.logger.error("App Render To HTML", e);
+          this.reporter.reportError("App Render To HTML", e);
           this.metrics.emitCounter("app.render.html.error", 1);
         }
         return html;

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

@@ -1,8 +1,9 @@
 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 { PreRender } from "../../react/prerender";
-import { time } from "../time";
+import { ServerTimingNames } from "../constants";
 import SSREntry from "./entry";
 export var render = function(param) {
   var App = param.App, context = param.context, config = param.config;
@@ -28,6 +29,8 @@ export var render = function(param) {
           cost = end();
           entry.logger.info("App Render Total cost = %d ms", cost);
           entry.metrics.emitTimer("app.render.cost", cost);
+          entry.reporter.reportTime("app_render_cost", cost);
+          entry.severTiming.addServeTiming(ServerTimingNames.SSR_RENDER_TOTAL, cost);
           cacheConfig = PreRender.config();
           if (cacheConfig) {
             context.ssrContext.cacheConfig = cacheConfig;

package/dist/esm/ssr/serverRender/reporter.js

@@ -0,0 +1,17 @@
+export function createSSRReporter(reporter) {
+  var _reporter = {
+    get sessionId() {
+      return reporter.sessionId;
+    },
+    get userId() {
+      return reporter.userId;
+    },
+    reportError: function reportError(content, e) {
+      reporter.reportError("SSR Error - ".concat(content), e);
+    },
+    reportTime: function reportTime(name, cost) {
+      reporter.reportTiming("ssr_".concat(name), cost);
+    }
+  };
+  return _reporter;
+}

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

@@ -152,6 +152,7 @@ export const documentPlugin = () => ({
               );
               const documentHtmlOptions = templateContent ? {
                 templateContent,
+                // Note: the behavior of inject/modify tags in afterTemplateExecution hook will not take effect
                 inject: false
               } : {};
               return {

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

@@ -121,6 +121,12 @@ export const routerPlugin = ({ serverBase = [], supportHtml5History = true, base
         },
         pickContext: ({ context, pickedContext }, next) => {
           const { remixRouter } = context;
+          if (!remixRouter) {
+            return next({
+              context,
+              pickedContext
+            });
+          }
           const router = {
             navigate: remixRouter.navigate,
             get location() {

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

@@ -0,0 +1,6 @@
+export var ServerTimingNames;
+(function(ServerTimingNames2) {
+  ServerTimingNames2["SSR_RENDER_TOTAL"] = "ssr-render-total";
+  ServerTimingNames2["SSR_PREFETCH"] = "ssr-prefetch";
+  ServerTimingNames2["SSR_RENDER_HTML"] = "ssr-render-html";
+})(ServerTimingNames || (ServerTimingNames = {}));

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

@@ -1,7 +1,7 @@
 import { createElement } from "react";
 import { run } from "@modern-js/utils/runtime-node";
+import { time } from "@modern-js/utils/universal/time";
 import { PreRender } from "../../react/prerender";
-import { time } from "../time";
 import renderToPipe from "./renderToPipe";
 export const render = ({ App, context }) => {
   const { ssrContext } = context;

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

@@ -3,17 +3,19 @@ import React from "react";
 import ReactDomServer from "react-dom/server";
 import { serializeJson } from "@modern-js/utils/runtime-node";
 import ReactHelmet from "react-helmet";
+import { time } from "@modern-js/utils/universal/time";
 import { serializeErrors } from "../../../router/runtime/utils";
 import helmetReplace from "../helmet";
 import { RenderLevel } from "../types";
-import { time } from "../time";
 import prefetch from "../../prefetch";
 import { ROUTER_DATA_JSON_ID, SSR_DATA_JSON_ID, attributesToString } from "../utils";
+import { createSSRReporter } from "../reporter";
+import { ServerTimingNames } from "../constants";
 import { toFragments } from "./template";
 import { reduce } from "./reduce";
 import * as loadableRenderer from "./loadable";
 import * as styledComponentRenderer from "./styledComponent";
-const buildTemplateData = (context, data, renderLevel) => {
+const buildTemplateData = (context, data, renderLevel, reporter) => {
   const { request, enableUnsafeCtx } = context;
   const unsafeContext = {
     headers: request.headers
@@ -28,6 +30,9 @@ const buildTemplateData = (context, data, renderLevel) => {
         host: request.host,
         url: request.url,
         ...enableUnsafeCtx ? unsafeContext : {}
+      },
+      reporter: {
+        sessionId: reporter.sessionId
       }
     },
     renderLevel
@@ -56,7 +61,7 @@ class Entry {
       errors: serializeErrors(routerContext.errors)
     } : void 0;
     let html = "";
-    const templateData = buildTemplateData(ssrContext, prefetchData, this.result.renderLevel);
+    const templateData = buildTemplateData(ssrContext, prefetchData, this.result.renderLevel, this.reporter);
     const SSRData = this.getSSRDataScript(templateData, routerData);
     for (const fragment of this.fragments) {
       if (fragment.isVariable && fragment.content === "SSRDataScript") {
@@ -77,9 +82,12 @@ class Entry {
       const prefetchCost = end();
       this.logger.debug(`App Prefetch cost = %d ms`, prefetchCost);
       this.metrics.emitTimer("app.prefetch.cost", prefetchCost);
+      this.reporter.reportTime("app_prefetch_cost", prefetchCost);
+      this.severTiming.addServeTiming(ServerTimingNames.SSR_PREFETCH, prefetchCost);
     } catch (e) {
       this.result.renderLevel = RenderLevel.CLIENT_RENDER;
       this.logger.error("App Prefetch Render", e);
+      this.reporter.reportError("App Prefetch Render", e);
       this.metrics.emitCounter("app.prefetch.render.error", 1);
     }
     return prefetchData || {};
@@ -111,9 +119,12 @@ class Entry {
       const cost = end();
       this.logger.debug("App Render To HTML cost = %d ms", cost);
       this.metrics.emitTimer("app.render.html.cost", cost);
+      this.reporter.reportTime("app_render_html_cost", cost);
+      this.severTiming.addServeTiming(ServerTimingNames.SSR_RENDER_HTML, cost);
       this.result.renderLevel = RenderLevel.SERVER_RENDER;
     } catch (e) {
       this.logger.error("App Render To HTML", e);
+      this.reporter.reportError("App Render To HTML", e);
       this.metrics.emitCounter("app.render.html.error", 1);
     }
     return html;
@@ -140,6 +151,8 @@ class Entry {
     _define_property(this, "result", void 0);
     _define_property(this, "metrics", void 0);
     _define_property(this, "logger", void 0);
+    _define_property(this, "severTiming", void 0);
+    _define_property(this, "reporter", void 0);
     _define_property(this, "template", void 0);
     _define_property(this, "App", void 0);
     _define_property(this, "fragments", void 0);
@@ -154,6 +167,8 @@ class Entry {
     this.host = host;
     this.App = options.App;
     this.pluginConfig = config;
+    this.reporter = createSSRReporter(ctx.reporter);
+    this.severTiming = ctx.serverTiming;
     this.metrics = ctx.metrics;
     this.logger = ctx.logger;
     this.nonce = nonce;

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

@@ -1,6 +1,7 @@
 import { run } from "@modern-js/utils/runtime-node";
+import { time } from "@modern-js/utils/universal/time";
 import { PreRender } from "../../react/prerender";
-import { time } from "../time";
+import { ServerTimingNames } from "../constants";
 import SSREntry from "./entry";
 export const render = ({ App, context, config }) => {
   const ssrContext = context.ssrContext;
@@ -16,6 +17,8 @@ export const render = ({ App, context, config }) => {
     const cost = end();
     entry.logger.info("App Render Total cost = %d ms", cost);
     entry.metrics.emitTimer("app.render.cost", cost);
+    entry.reporter.reportTime("app_render_cost", cost);
+    entry.severTiming.addServeTiming(ServerTimingNames.SSR_RENDER_TOTAL, cost);
     const cacheConfig = PreRender.config();
     if (cacheConfig) {
       context.ssrContext.cacheConfig = cacheConfig;

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

@@ -0,0 +1,17 @@
+export function createSSRReporter(reporter) {
+  const _reporter = {
+    get sessionId() {
+      return reporter.sessionId;
+    },
+    get userId() {
+      return reporter.userId;
+    },
+    reportError(content, e) {
+      reporter.reportError(`SSR Error - ${content}`, e);
+    },
+    reportTime(name, cost) {
+      reporter.reportTiming(`ssr_${name}`, cost);
+    }
+  };
+  return _reporter;
+}

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

@@ -30,6 +30,10 @@ export type RouterConfig = {
     globalApp?: React.ComponentType<any>;
     routes: (NestedRoute | PageRoute)[];
   };
+  /**
+   * You should not use it
+   */
+  oldVersion?: boolean;
   serverBase?: string[];
   supportHtml5History?: boolean;
   basename?: string;

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

@@ -0,0 +1,5 @@
+export declare enum ServerTimingNames {
+  SSR_RENDER_TOTAL = "ssr-render-total",
+  SSR_PREFETCH = "ssr-prefetch",
+  SSR_RENDER_HTML = "ssr-render-html",
+}

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

@@ -1,4 +1,5 @@
 import { RuntimeContext, ModernSSRReactComponent, SSRPluginConfig } from '../types';
+import { SSRReporter } from '../reporter';
 import { SSRServerContext, RenderResult } from './type';
 type EntryOptions = {
   ctx: SSRServerContext;
@@ -10,6 +11,8 @@ export default class Entry {
   result: RenderResult;
   metrics: SSRServerContext['metrics'];
   logger: SSRServerContext['logger'];
+  severTiming: SSRServerContext['serverTiming'];
+  reporter: SSRReporter;
   private readonly template;
   private readonly App;
   private readonly fragments;

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

@@ -0,0 +1,8 @@
+import { SSRServerContext } from './types';
+export type SSRReporter = ReturnType<typeof createSSRReporter>;
+export declare function createSSRReporter(reporter: SSRServerContext['reporter']): {
+  readonly sessionId: string | undefined;
+  readonly userId: string | undefined;
+  reportError(content: string, e: Error): void;
+  reportTime(name: string, cost: number): void;
+};

package/package.json

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

package/dist/cjs/ssr/serverRender/time.js

@@ -1,20 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "time", {
-  enumerable: true,
-  get: function() {
-    return time;
-  }
-});
-const getLatency = (hrtime) => {
-  const [s, ns] = process.hrtime(hrtime);
-  return s * 1e3 + ns / 1e6;
-};
-const time = () => {
-  const hrtime = process.hrtime();
-  return () => {
-    return getLatency(hrtime);
-  };
-};

package/dist/cjs/ssr/serverRender/time.worker.js

@@ -1,38 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "time", {
-  enumerable: true,
-  get: function() {
-    return time;
-  }
-});
-function processHrtime(previousTimestamp) {
-  const now = (/* @__PURE__ */ new Date()).getTime();
-  const clocktime = now * 1e-3;
-  let seconds = Math.floor(clocktime);
-  let nanoseconds = Math.floor(clocktime % 1 * 1e9);
-  if (previousTimestamp) {
-    seconds -= previousTimestamp[0];
-    nanoseconds -= previousTimestamp[1];
-    if (nanoseconds < 0) {
-      seconds--;
-      nanoseconds += 1e9;
-    }
-  }
-  return [
-    seconds,
-    nanoseconds
-  ];
-}
-const getLatency = (hrtime) => {
-  const [s, ns] = processHrtime(hrtime);
-  return s * 1e3 + ns / 1e6;
-};
-const time = () => {
-  const hrtime = processHrtime();
-  return () => {
-    return getLatency(hrtime);
-  };
-};

package/dist/esm/ssr/serverRender/time.js

@@ -1,11 +0,0 @@
-import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
-var getLatency = function(hrtime) {
-  var _process_hrtime = _sliced_to_array(process.hrtime(hrtime), 2), s = _process_hrtime[0], ns = _process_hrtime[1];
-  return s * 1e3 + ns / 1e6;
-};
-export var time = function() {
-  var hrtime = process.hrtime();
-  return function() {
-    return getLatency(hrtime);
-  };
-};

package/dist/esm/ssr/serverRender/time.worker.js

@@ -1,29 +0,0 @@
-import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
-function processHrtime(previousTimestamp) {
-  var now = (/* @__PURE__ */ new Date()).getTime();
-  var clocktime = now * 1e-3;
-  var seconds = Math.floor(clocktime);
-  var nanoseconds = Math.floor(clocktime % 1 * 1e9);
-  if (previousTimestamp) {
-    seconds -= previousTimestamp[0];
-    nanoseconds -= previousTimestamp[1];
-    if (nanoseconds < 0) {
-      seconds--;
-      nanoseconds += 1e9;
-    }
-  }
-  return [
-    seconds,
-    nanoseconds
-  ];
-}
-var getLatency = function(hrtime) {
-  var _processHrtime = _sliced_to_array(processHrtime(hrtime), 2), s = _processHrtime[0], ns = _processHrtime[1];
-  return s * 1e3 + ns / 1e6;
-};
-export var time = function() {
-  var hrtime = processHrtime();
-  return function() {
-    return getLatency(hrtime);
-  };
-};

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

@@ -1,10 +0,0 @@
-const getLatency = (hrtime) => {
-  const [s, ns] = process.hrtime(hrtime);
-  return s * 1e3 + ns / 1e6;
-};
-export const time = () => {
-  const hrtime = process.hrtime();
-  return () => {
-    return getLatency(hrtime);
-  };
-};

package/dist/esm-node/ssr/serverRender/time.worker.js

@@ -1,28 +0,0 @@
-function processHrtime(previousTimestamp) {
-  const now = (/* @__PURE__ */ new Date()).getTime();
-  const clocktime = now * 1e-3;
-  let seconds = Math.floor(clocktime);
-  let nanoseconds = Math.floor(clocktime % 1 * 1e9);
-  if (previousTimestamp) {
-    seconds -= previousTimestamp[0];
-    nanoseconds -= previousTimestamp[1];
-    if (nanoseconds < 0) {
-      seconds--;
-      nanoseconds += 1e9;
-    }
-  }
-  return [
-    seconds,
-    nanoseconds
-  ];
-}
-const getLatency = (hrtime) => {
-  const [s, ns] = processHrtime(hrtime);
-  return s * 1e3 + ns / 1e6;
-};
-export const time = () => {
-  const hrtime = processHrtime();
-  return () => {
-    return getLatency(hrtime);
-  };
-};

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

@@ -1 +0,0 @@
-export declare const time: () => () => number;

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

@@ -1 +0,0 @@
-export declare const time: () => () => number;