@modern-js/runtime 2.27.1-alpha.0 → 2.29.0

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

@@ -81,9 +81,9 @@ export function renderRoutes(param) {
   return routeElements;
 }
 export function getLocation(serverContext) {
-  var _url_replace;
-  var _ref = (serverContext === null || serverContext === void 0 ? void 0 : serverContext.request) || {}, pathname = _ref.pathname, url = _ref.url;
-  var cleanUrl = (_url_replace = url === null || url === void 0 ? void 0 : url.replace("http://", "")) === null || _url_replace === void 0 ? void 0 : _url_replace.replace("https://", "");
+  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 index = (cleanUrl || "").indexOf(pathname);
   if (index === -1) {
     return pathname;

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

@@ -4,14 +4,15 @@ 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;
-  if ((server === null || server === void 0 ? void 0 : server.ssr) && !isStreaming(server.ssr)) {
+  if (((_server = server) === null || _server === void 0 ? void 0 : _server.ssr) && !isStreaming(server.ssr)) {
     return true;
   }
-  if ((server === null || server === void 0 ? void 0 : server.ssrByEntries) && typeof server.ssrByEntries === "object") {
+  if (((_server1 = server) === null || _server1 === void 0 ? void 0 : _server1.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) {
@@ -112,9 +113,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 _ref;
+            var _this, _runtimeConfig;
             var runtimeConfig = getEntryOptions(entryName, isMainEntry, userConfig.runtime, userConfig.runtimeByEntries, packageName);
-            if (((_ref = runtimeConfig === null || runtimeConfig === void 0 ? void 0 : runtimeConfig.router) === null || _ref === void 0 ? void 0 : _ref.mode) === "react-router-5") {
+            if (((_this = (_runtimeConfig = 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) {
@@ -141,8 +142,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, _bundlerConfigs_find_output;
-            var chunkLoadingGlobal = (_bundlerConfigs_find = bundlerConfigs === null || bundlerConfigs === void 0 ? void 0 : bundlerConfigs.find(function(config2) {
+            var _bundlerConfigs_find_output, _bundlerConfigs_find, _bundlerConfigs;
+            var chunkLoadingGlobal = (_bundlerConfigs = 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

@@ -22,7 +22,7 @@ export var ssr = function(config) {
       return {
         client: function() {
           var _ref = _async_to_generator(function(param) {
-            var App, context, ModernRender, ModernHydrate, _window__SSR_DATA, hydrateContext, callback, renderLevel;
+            var App, context, ModernRender, ModernHydrate, _window__SSR_DATA, _window, hydrateContext, callback, renderLevel;
             function stringSSRHydrate() {
               if (renderLevel === RenderLevel.CLIENT_RENDER || renderLevel === RenderLevel.SERVER_PREFETCH) {
                 ModernRender(/* @__PURE__ */ _jsx(App, {
@@ -88,7 +88,7 @@ export var ssr = function(config) {
               callback = function() {
                 delete hydrateContext._hydration;
               };
-              renderLevel = (window === null || window === void 0 ? void 0 : (_window__SSR_DATA = window._SSR_DATA) === null || _window__SSR_DATA === void 0 ? void 0 : _window__SSR_DATA.renderLevel) || RenderLevel.CLIENT_RENDER;
+              renderLevel = ((_window = window) === null || _window === void 0 ? void 0 : (_window__SSR_DATA = _window._SSR_DATA) === null || _window__SSR_DATA === void 0 ? void 0 : _window__SSR_DATA.renderLevel) || RenderLevel.CLIENT_RENDER;
               if (isReact18() && config.mode === "stream") {
                 return [
                   2,
@@ -107,8 +107,8 @@ export var ssr = function(config) {
         }(),
         init: function init(param, next) {
           var context = param.context;
-          var _window__SSR_DATA, _window__SSR_DATA_context;
-          var request = window === null || window === void 0 ? void 0 : (_window__SSR_DATA = window._SSR_DATA) === null || _window__SSR_DATA === void 0 ? void 0 : (_window__SSR_DATA_context = _window__SSR_DATA.context) === null || _window__SSR_DATA_context === void 0 ? void 0 : _window__SSR_DATA_context.request;
+          var _window__SSR_DATA_context, _window__SSR_DATA, _window;
+          var request = (_window = window) === null || _window === void 0 ? void 0 : (_window__SSR_DATA = _window._SSR_DATA) === null || _window__SSR_DATA === void 0 ? void 0 : (_window__SSR_DATA_context = _window__SSR_DATA.context) === null || _window__SSR_DATA_context === void 0 ? void 0 : _window__SSR_DATA_context.request;
           if (!request) {
             context.ssrContext = _object_spread_props(_object_spread({}, context.ssrContext), {
               response: mockResp,
@@ -126,8 +126,8 @@ export var ssr = function(config) {
         },
         pickContext: function(param, next) {
           var context = param.context, pickedContext = param.pickedContext;
-          var _window__SSR_DATA, _window__SSR_DATA_context;
-          var request = window === null || window === void 0 ? void 0 : (_window__SSR_DATA = window._SSR_DATA) === null || _window__SSR_DATA === void 0 ? void 0 : (_window__SSR_DATA_context = _window__SSR_DATA.context) === null || _window__SSR_DATA_context === void 0 ? void 0 : _window__SSR_DATA_context.request;
+          var _window__SSR_DATA_context, _window__SSR_DATA, _window;
+          var request = (_window = window) === null || _window === void 0 ? void 0 : (_window__SSR_DATA = _window._SSR_DATA) === null || _window__SSR_DATA === void 0 ? void 0 : (_window__SSR_DATA_context = _window__SSR_DATA.context) === null || _window__SSR_DATA_context === void 0 ? void 0 : _window__SSR_DATA_context.request;
           var initialData = context.initialData;
           if (!request) {
             return next({

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

@@ -49,7 +49,8 @@ export var ssr = function() {
         },
         pickContext: function(param, next) {
           var context = param.context, pickedContext = param.pickedContext;
-          var _ref = context === null || context === void 0 ? void 0 : context.ssrContext, request = _ref.request, response = _ref.response;
+          var _context;
+          var _ref = (_context = 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

@@ -10,7 +10,7 @@ var prefetch = function() {
       return [
         2,
         run(context.ssrContext.request.headers, /* @__PURE__ */ _async_to_generator(function() {
-          var _context_store, ssrContext, loadableStats, extractor, loadersData;
+          var _context_store, _context, ssrContext, loadableStats, extractor, loadersData;
           return _ts_generator(this, function(_state2) {
             switch (_state2.label) {
               case 0:
@@ -61,7 +61,7 @@ var prefetch = function() {
                     initialData: context.initialData,
                     i18nData: context.__i18nData__,
                     // todo: move to plugin state
-                    storeState: context === null || context === void 0 ? void 0 : (_context_store = context.store) === null || _context_store === void 0 ? void 0 : _context_store.getState()
+                    storeState: (_context = 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,8 +46,9 @@ 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 === null || prop === void 0 ? void 0 : prop.hasOwnProperty(key)) && usefulArray(prop[key])) {
+      if (((_prop = prop) === null || _prop === void 0 ? void 0 : _prop.hasOwnProperty(key)) && usefulArray(prop[key])) {
         result[key] = unique(result[key].concat(prop[key]));
       }
     });
@@ -72,8 +73,9 @@ 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 === null || prop === void 0 ? void 0 : prop.hasOwnProperty(key)) && usefulObject(prop[key])) {
+      if (((_prop = 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/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/bulidTemplate.before.js

@@ -9,6 +9,7 @@ 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 "";
@@ -16,7 +17,7 @@ function getHeadTemplate(beforeEntryTemplate, context) {
       var routeAssets = routeManifest.routeAssets;
       var cssChunks = [];
       var matches = matchRoutes(routes, routerContext.location, routerContext.basename);
-      matches === null || matches === void 0 ? void 0 : matches.forEach(function(match, index) {
+      (_matches = matches) === null || _matches === void 0 ? void 0 : _matches.forEach(function(match, index) {
         if (!index) {
           return;
         }
@@ -27,7 +28,8 @@ function getHeadTemplate(beforeEntryTemplate, context) {
             var _cssChunks;
             var _routeManifest_referenceCssAssets = routeManifest2.referenceCssAssets, referenceCssAssets = _routeManifest_referenceCssAssets === void 0 ? [] : _routeManifest_referenceCssAssets;
             var _cssChunks1 = referenceCssAssets.filter(function(asset) {
-              return (asset === null || asset === void 0 ? void 0 : asset.endsWith(".css")) && !headTemplate2.includes(asset);
+              var _asset;
+              return ((_asset = 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

@@ -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/renderToStream/renderToPipe.js

@@ -16,17 +16,18 @@ 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 === null || ssrContext === void 0 ? void 0 : ssrContext.nonce,
+        nonce: (_ssrContext = ssrContext) === null || _ssrContext === void 0 ? void 0 : _ssrContext.nonce,
         onShellReady: function onShellReady() {
-          var _options_onShellReady;
+          var _options_onShellReady, _options;
           var _getTemplates = getTemplates(context, RenderLevel.SERVER_RENDER), shellAfter = _getTemplates.shellAfter, shellBefore = _getTemplates.shellBefore;
-          options === null || options === void 0 ? void 0 : (_options_onShellReady = options.onShellReady) === null || _options_onShellReady === void 0 ? void 0 : _options_onShellReady.call(options);
+          (_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 {
@@ -54,18 +55,18 @@ function renderToPipe(rootElement, context, options) {
           resolve(pipe(injectableTransform).pipe(stream));
         },
         onShellError: function onShellError(error) {
-          var _options_onShellError;
+          var _options_onShellError, _options;
           ssrContext.metrics.emitCounter("app.render.streaming.shell.error", 1);
           var _getTemplates = getTemplates(context, RenderLevel.CLIENT_RENDER), shellAfter = _getTemplates.shellAfter, shellBefore = _getTemplates.shellBefore;
           var fallbackHtml = "".concat(shellBefore).concat(shellAfter);
           resolve(fallbackHtml);
-          options === null || options === void 0 ? void 0 : (_options_onShellError = options.onShellError) === null || _options_onShellError === void 0 ? void 0 : _options_onShellError.call(options, error);
+          (_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;
+          var _options_onError, _options;
           ssrContext.logger.error("An error occurs during streaming SSR", error);
           ssrContext.metrics.emitCounter("app.render.streaming.error", 1);
-          options === null || options === void 0 ? void 0 : (_options_onError = options.onError) === null || _options_onError === void 0 ? void 0 : _options_onError.call(options, error);
+          (_options = options) === null || _options === void 0 ? void 0 : (_options_onError = _options.onError) === null || _options_onError === void 0 ? void 0 : _options_onError.call(_options, error);
         }
       })).pipe;
     });

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

@@ -16,7 +16,7 @@ function renderToPipe(rootElement, context, options) {
   var ssrContext = context.ssrContext;
   var forUserPipe = function() {
     var _ref = _async_to_generator(function() {
-      var renderToReadableStream, _getTemplates, shellAfter, shellBefore, readableOriginal, reader, injectableStream, err, _getTemplates1, shellAfter1, shellBefore1, fallbackHtml;
+      var renderToReadableStream, _getTemplates, shellAfter, shellBefore, _ssrContext, readableOriginal, reader, injectableStream, err, _ssrContext1, _getTemplates1, shellAfter1, shellBefore1, fallbackHtml;
       return _ts_generator(this, function(_state) {
         switch (_state.label) {
           case 0:
@@ -36,12 +36,12 @@ function renderToPipe(rootElement, context, options) {
             return [
               4,
               renderToReadableStream(rootElement, _object_spread_props(_object_spread({}, options), {
-                nonce: ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.nonce,
+                nonce: (_ssrContext = ssrContext) === null || _ssrContext === void 0 ? void 0 : _ssrContext.nonce,
                 onError: function onError(error) {
-                  var _options_onError;
-                  ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.logger.error("An error occurs during streaming SSR", error);
-                  ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.metrics.emitCounter("app.render.streaming.error", 1);
-                  options === null || options === void 0 ? void 0 : (_options_onError = options.onError) === null || _options_onError === void 0 ? void 0 : _options_onError.call(options, 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);
                 }
               }))
             ];
@@ -101,7 +101,7 @@ function renderToPipe(rootElement, context, options) {
             ];
           case 3:
             err = _state.sent();
-            ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.metrics.emitCounter("app.render.streaming.shell.error", 1);
+            (_ssrContext1 = ssrContext) === null || _ssrContext1 === void 0 ? void 0 : _ssrContext1.metrics.emitCounter("app.render.streaming.shell.error", 1);
             _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

@@ -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/renderToString/loadable.js

@@ -1,10 +1,11 @@
 import { ChunkExtractor } from "@loadable/server";
 import { attributesToString, getLoadableScripts } from "../utils";
 var extname = function(uri) {
+  var _uri;
   if (typeof uri !== "string" || !uri.includes(".")) {
     return "";
   }
-  return ".".concat(uri === null || uri === void 0 ? void 0 : uri.split(".").pop()) || "";
+  return ".".concat((_uri = uri) === null || _uri === void 0 ? void 0 : _uri.split(".").pop()) || "";
 };
 export var toHtml = function(jsx, renderer, next) {
   var stats = renderer.stats, chunksMap = renderer.result.chunksMap, _renderer_config = renderer.config, config = _renderer_config === void 0 ? {} : _renderer_config, nonce = renderer.nonce;

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/state/runtime/plugin.js

@@ -77,8 +77,8 @@ var state = function(config) {
         init: function init(param, next) {
           var context = param.context;
           if (isBrowser()) {
-            var _window__SSR_DATA, _window__SSR_DATA_data;
-            storeConfig.initialState = storeConfig.initialState || (window === null || window === void 0 ? void 0 : (_window__SSR_DATA = window._SSR_DATA) === null || _window__SSR_DATA === void 0 ? void 0 : (_window__SSR_DATA_data = _window__SSR_DATA.data) === null || _window__SSR_DATA_data === void 0 ? void 0 : _window__SSR_DATA_data.storeState) || {};
+            var _window__SSR_DATA_data, _window__SSR_DATA, _window;
+            storeConfig.initialState = storeConfig.initialState || ((_window = window) === null || _window === void 0 ? void 0 : (_window__SSR_DATA = _window._SSR_DATA) === null || _window__SSR_DATA === void 0 ? void 0 : (_window__SSR_DATA_data = _window__SSR_DATA.data) === null || _window__SSR_DATA_data === void 0 ? void 0 : _window__SSR_DATA_data.storeState) || {};
           }
           context.store = createStore(storeConfig);
           return next({

package/dist/esm-node/core/compatible.js

@@ -48,15 +48,16 @@ export const createApp = ({ plugins, props: globalProps }) => {
     }, {
       onLast: ({ App: App2 }) => {
         const WrapComponent = ({ context, ...props }) => {
+          var _contextValue;
           let contextValue = context;
-          if (!(contextValue === null || contextValue === void 0 ? void 0 : contextValue.runner)) {
+          if (!((_contextValue = contextValue) === null || _contextValue === void 0 ? void 0 : _contextValue.runner)) {
             contextValue = getInitialContext(runner);
             runner.init({
               context: contextValue
             }, {
               onLast: ({ context: context1 }) => {
-                var _App_init;
-                return App2 === null || App2 === void 0 ? void 0 : (_App_init = App2.init) === null || _App_init === void 0 ? void 0 : _App_init.call(App2, context1);
+                var _App_init, _App;
+                return (_App = App2) === null || _App === void 0 ? void 0 : (_App_init = _App.init) === null || _App_init === void 0 ? void 0 : _App_init.call(_App, context1);
               }
             });
           }
@@ -88,16 +89,14 @@ export const bootstrap = async (BootApp, id, root, ReactDOM) => {
     runner = runnerMap.get(App);
   }
   const context = getInitialContext(runner);
-  const runInit = (_context) => {
-    return runner.init({
-      context: _context
-    }, {
-      onLast: ({ context: context1 }) => {
-        var _App_init;
-        return App === null || App === void 0 ? void 0 : (_App_init = App.init) === null || _App_init === void 0 ? void 0 : _App_init.call(App, context1);
-      }
-    });
-  };
+  const runInit = (_context) => runner.init({
+    context: _context
+  }, {
+    onLast: ({ context: context1 }) => {
+      var _App_init, _App;
+      return (_App = App) === null || _App === void 0 ? void 0 : (_App_init = _App.init) === null || _App_init === void 0 ? void 0 : _App_init.call(_App, context1);
+    }
+  });
   if (!id) {
     return /* @__PURE__ */ React.createElement(App, {
       context
@@ -106,9 +105,9 @@ export const bootstrap = async (BootApp, id, root, ReactDOM) => {
   const isBrowser = typeof window !== "undefined" && window.name !== "nodejs";
   if (isBrowser) {
     if (isClientArgs(id)) {
-      var _ssrData_data, _ssrData_data1;
+      var _ssrData_data, _ssrData, _ssrData1, _ssrData_data1, _ssrData2;
       const ssrData = window._SSR_DATA;
-      const loadersData = (ssrData === null || ssrData === void 0 ? void 0 : (_ssrData_data = ssrData.data) === null || _ssrData_data === void 0 ? void 0 : _ssrData_data.loadersData) || {};
+      const loadersData = ((_ssrData = ssrData) === null || _ssrData === void 0 ? void 0 : (_ssrData_data = _ssrData.data) === null || _ssrData_data === void 0 ? void 0 : _ssrData_data.loadersData) || {};
       const initialLoadersState = Object.keys(loadersData).reduce((res, key) => {
         const loaderData = loadersData[key];
         if (loaderData.loading !== false) {
@@ -122,10 +121,10 @@ export const bootstrap = async (BootApp, id, root, ReactDOM) => {
           skipStatic: true
         }),
         ...ssrData ? {
-          ssrContext: ssrData === null || ssrData === void 0 ? void 0 : ssrData.context
+          ssrContext: (_ssrData1 = ssrData) === null || _ssrData1 === void 0 ? void 0 : _ssrData1.context
         } : {}
       });
-      context.initialData = ssrData === null || ssrData === void 0 ? void 0 : (_ssrData_data1 = ssrData.data) === null || _ssrData_data1 === void 0 ? void 0 : _ssrData_data1.initialData;
+      context.initialData = (_ssrData2 = ssrData) === null || _ssrData2 === void 0 ? void 0 : (_ssrData_data1 = _ssrData2.data) === null || _ssrData_data1 === void 0 ? void 0 : _ssrData_data1.initialData;
       const initialData = await runInit(context);
       if (initialData) {
         context.initialData = initialData;

package/dist/esm-node/core/loader/useLoader.js

@@ -14,7 +14,7 @@ const useLoader = (loaderFn, options = {
     delete options._cache;
   }
   const load = useCallback((params) => {
-    var _unlistenLoaderChangeRef_current, _window__SSR_DATA_data_loadersData_id, _window__SSR_DATA, _window__SSR_DATA_data, _loaderRef_current;
+    var _unlistenLoaderChangeRef_current, _unlistenLoaderChangeRef, _window__SSR_DATA_data_loadersData_id, _window__SSR_DATA_data, _window__SSR_DATA, _window, _loaderRef_current;
     if (typeof params === "undefined") {
       var _loaderRef_current1;
       return (_loaderRef_current1 = loaderRef.current) === null || _loaderRef_current1 === void 0 ? void 0 : _loaderRef_current1.load();
@@ -34,37 +34,35 @@ const useLoader = (loaderFn, options = {
       params
     });
     loaderRef.current = loaderManager.get(id);
-    (_unlistenLoaderChangeRef_current = unlistenLoaderChangeRef.current) === null || _unlistenLoaderChangeRef_current === void 0 ? void 0 : _unlistenLoaderChangeRef_current.call(unlistenLoaderChangeRef);
+    (_unlistenLoaderChangeRef_current = (_unlistenLoaderChangeRef = unlistenLoaderChangeRef).current) === null || _unlistenLoaderChangeRef_current === void 0 ? void 0 : _unlistenLoaderChangeRef_current.call(_unlistenLoaderChangeRef);
     if (isSSRRender) {
       return void 0;
     }
     if (options.skip) {
       return void 0;
     }
-    if (context._hydration && ((_window__SSR_DATA_data_loadersData_id = window === null || window === void 0 ? void 0 : (_window__SSR_DATA = window._SSR_DATA) === null || _window__SSR_DATA === void 0 ? void 0 : (_window__SSR_DATA_data = _window__SSR_DATA.data) === null || _window__SSR_DATA_data === void 0 ? void 0 : _window__SSR_DATA_data.loadersData[id]) === null || _window__SSR_DATA_data_loadersData_id === void 0 ? void 0 : _window__SSR_DATA_data_loadersData_id.error) === null) {
+    if (context._hydration && ((_window = window) === null || _window === void 0 ? void 0 : (_window__SSR_DATA = _window._SSR_DATA) === null || _window__SSR_DATA === void 0 ? void 0 : (_window__SSR_DATA_data = _window__SSR_DATA.data) === null || _window__SSR_DATA_data === void 0 ? void 0 : (_window__SSR_DATA_data_loadersData_id = _window__SSR_DATA_data.loadersData[id]) === null || _window__SSR_DATA_data_loadersData_id === void 0 ? void 0 : _window__SSR_DATA_data_loadersData_id.error) === null) {
       return void 0;
     }
     const res = loaderRef.current.load();
     unlistenLoaderChangeRef.current = (_loaderRef_current = loaderRef.current) === null || _loaderRef_current === void 0 ? void 0 : _loaderRef_current.onChange((_status, _result) => {
       setResult(_result);
       if (_status === LoaderStatus.fulfilled) {
-        var _options_onSuccess;
-        options === null || options === void 0 ? void 0 : (_options_onSuccess = options.onSuccess) === null || _options_onSuccess === void 0 ? void 0 : _options_onSuccess.call(options, _result.data);
+        var _options_onSuccess, _options;
+        (_options = options) === null || _options === void 0 ? void 0 : (_options_onSuccess = _options.onSuccess) === null || _options_onSuccess === void 0 ? void 0 : _options_onSuccess.call(_options, _result.data);
       }
       if (_status === LoaderStatus.rejected) {
-        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, _result.error);
+        var _options_onError, _options1;
+        (_options1 = options) === null || _options1 === void 0 ? void 0 : (_options_onError = _options1.onError) === null || _options_onError === void 0 ? void 0 : _options_onError.call(_options1, _result.error);
       }
     });
     return res;
   }, [
     options.skip
   ]);
-  useEffect(() => {
-    return () => {
-      var _unlistenLoaderChangeRef_current;
-      (_unlistenLoaderChangeRef_current = unlistenLoaderChangeRef.current) === null || _unlistenLoaderChangeRef_current === void 0 ? void 0 : _unlistenLoaderChangeRef_current.call(unlistenLoaderChangeRef);
-    };
+  useEffect(() => () => {
+    var _unlistenLoaderChangeRef_current, _unlistenLoaderChangeRef;
+    (_unlistenLoaderChangeRef_current = (_unlistenLoaderChangeRef = unlistenLoaderChangeRef).current) === null || _unlistenLoaderChangeRef_current === void 0 ? void 0 : _unlistenLoaderChangeRef_current.call(_unlistenLoaderChangeRef);
   }, []);
   useMemo(() => {
     var _options_params;

package/dist/esm-node/core/plugin.js

@@ -18,12 +18,13 @@ export const createRuntime = () => createManager(runtimeHooks);
 const registerInit = (App, _init) => {
   const originalInit = App.init;
   App.init = async (context) => {
+    var _originalInit, _init1;
     if (!context.loaderManager) {
       context.loaderManager = createLoaderManager({});
     }
     await Promise.all([
-      originalInit === null || originalInit === void 0 ? void 0 : originalInit(context),
-      _init === null || _init === void 0 ? void 0 : _init(context)
+      (_originalInit = originalInit) === null || _originalInit === void 0 ? void 0 : _originalInit(context),
+      (_init1 = _init) === null || _init1 === void 0 ? void 0 : _init1(context)
     ]);
   };
 };

package/dist/esm-node/document/Html.js

@@ -6,7 +6,8 @@ function findTargetChild(tag, children) {
   return children.find((item) => getEleType(item) === tag);
 }
 function getEleType(ele) {
-  return typeof (ele === null || ele === void 0 ? void 0 : ele.type) === "function" ? ele.type.name : ele === null || ele === void 0 ? void 0 : ele.type;
+  var _ele, _ele1;
+  return typeof ((_ele = ele) === null || _ele === void 0 ? void 0 : _ele.type) === "function" ? ele.type.name : (_ele1 = ele) === null || _ele1 === void 0 ? void 0 : _ele1.type;
 }
 function findTargetElement(tag, children) {
   if (children.length === 0) {
@@ -14,11 +15,11 @@ function findTargetElement(tag, children) {
   }
   let nextChildren = [];
   for (const item of children) {
-    var _item_props;
+    var _item_props, _item;
     if (tag === getEleType(item)) {
       return item;
     }
-    if (item === null || item === void 0 ? void 0 : (_item_props = item.props) === null || _item_props === void 0 ? void 0 : _item_props.children) {
+    if ((_item = item) === null || _item === void 0 ? void 0 : (_item_props = _item.props) === null || _item_props === void 0 ? void 0 : _item_props.children) {
       nextChildren = nextChildren.concat(item.props.children);
     }
   }