@modern-js/runtime 2.34.0 → 2.35.0

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

@@ -10,6 +10,9 @@ function _export(target, all) {
     });
 }
 _export(exports, {
+  renderRoutes: function() {
+    return _utils.renderRoutes;
+  },
   default: function() {
     return _default;
   },
@@ -202,6 +205,7 @@ _export(exports, {
 const _export_star = require("@swc/helpers/_/_export_star");
 const _router = require("@modern-js/utils/runtime/router");
 const _plugin = require("./plugin");
+const _utils = require("./utils");
 _export_star._(require("./withRouter"), exports);
 const _PrefetchLink = require("./PrefetchLink");
 const _default = _plugin.routerPlugin;

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

@@ -21,6 +21,7 @@ const _export_star = require("@swc/helpers/_/_export_star");
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _utils = require("./utils");
 const _serverRender = /* @__PURE__ */ _interop_require_default._(require("./serverRender"));
+const _tracker = require("./serverRender/tracker");
 _export_star._(require("./react"), exports);
 const ssr = (config = {}) => ({
   name: "@modern-js/plugin-ssr",
@@ -38,6 +39,7 @@ const ssr = (config = {}) => ({
         const { request } = context.ssrContext;
         context.ssrContext.request = (0, _utils.formatServer)(request);
         context.ssrContext.mode = config.mode;
+        context.ssrContext.tracker = (0, _tracker.createSSRTracker)(context.ssrContext);
         if (!context.ssrContext.htmlModifiers) {
           context.ssrContext.htmlModifiers = [];
         }

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

@@ -21,7 +21,7 @@ function buildShellAfterTemplate(afterAppTemplate, options) {
     return template.replace("<!--<?- SSRDataScript ?>-->", ssrDataScript);
     function buildSSRDataScript() {
       const { context: { ssrContext, initialData, __i18nData__ }, renderLevel } = options;
-      const { request, enableUnsafeCtx, nonce } = ssrContext;
+      const { request, enableUnsafeCtx, nonce, tracker } = ssrContext;
       const unsafeContext = {
         headers: request.headers
       };
@@ -31,6 +31,9 @@ function buildShellAfterTemplate(afterAppTemplate, options) {
           i18nData: __i18nData__
         },
         context: {
+          reporter: {
+            sessionId: tracker.sessionId
+          },
           request: {
             params: request.params,
             query: request.query,

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

@@ -13,6 +13,7 @@ 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 _tracker = require("../tracker");
 const _renderToPipe = /* @__PURE__ */ _interop_require_default._(require("./renderToPipe"));
 const render = ({ App, context }) => {
   const { ssrContext } = context;
@@ -26,17 +27,25 @@ const render = ({ App, context }) => {
         ssr: true
       })
     });
+    const { tracker } = ssrContext;
     const pipe = (0, _renderToPipe.default)(rootElement, context, {
       onShellReady() {
         const cacheConfig = _prerender.PreRender.config();
         if (cacheConfig) {
           ssrContext.cacheConfig = cacheConfig;
         }
+        const cost = end();
+        tracker.trackTiming(_tracker.SSRTimings.SSR_RENDER_SHELL, cost);
       },
       onAllReady() {
         const cost = end();
-        ssrContext.logger.debug("App Render To HTML cost = %d ms", cost);
-        ssrContext.metrics.emitTimer("app.render.html.cost", cost);
+        tracker.trackTiming(_tracker.SSRTimings.SSR_RENDER_TOTAL, cost);
+      },
+      onShellError(e) {
+        tracker.trackError(_tracker.SSRErrors.RENDER_SHELL, e);
+      },
+      onError(error) {
+        tracker.trackError(_tracker.SSRErrors.RENDER_STREAM, error);
       }
     });
     return pipe;

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

@@ -64,17 +64,10 @@ function renderToPipe(rootElement, context, options) {
         },
         onShellError(error) {
           var _options_onShellError, _options;
-          ssrContext.metrics.emitCounter("app.render.streaming.shell.error", 1);
           const { shellAfter, shellBefore } = (0, _template.getTemplates)(context, _types.RenderLevel.CLIENT_RENDER);
           const fallbackHtml = `${shellBefore}${shellAfter}`;
           resolve(fallbackHtml);
           (_options = options) === null || _options === void 0 ? void 0 : (_options_onShellError = _options.onShellError) === null || _options_onShellError === void 0 ? void 0 : _options_onShellError.call(_options, error);
-        },
-        onError(error) {
-          var _options_onError, _options;
-          ssrContext.logger.error("An error occurs during streaming SSR", error);
-          ssrContext.metrics.emitCounter("app.render.streaming.error", 1);
-          (_options = options) === null || _options === void 0 ? void 0 : (_options_onError = _options.onError) === null || _options_onError === void 0 ? void 0 : _options_onError.call(_options, error);
         }
       });
     });

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

@@ -10,6 +10,7 @@ Object.defineProperty(exports, "default", {
 });
 const _types = require("../types");
 const _common = require("../../../common");
+const _tracker = require("../tracker");
 const _template = require("./template");
 var ShellChunkStatus;
 (function(ShellChunkStatus2) {
@@ -33,9 +34,7 @@ function renderToPipe(rootElement, context, options) {
         ...options,
         nonce: (_ssrContext = ssrContext) === null || _ssrContext === void 0 ? void 0 : _ssrContext.nonce,
         onError(error) {
-          var _ssrContext2, _ssrContext12, _options_onError, _options;
-          (_ssrContext2 = ssrContext) === null || _ssrContext2 === void 0 ? void 0 : _ssrContext2.logger.error("An error occurs during streaming SSR", error);
-          (_ssrContext12 = ssrContext) === null || _ssrContext12 === void 0 ? void 0 : _ssrContext12.metrics.emitCounter("app.render.streaming.error", 1);
+          var _options_onError, _options;
           (_options = options) === null || _options === void 0 ? void 0 : (_options_onError = _options.onError) === null || _options_onError === void 0 ? void 0 : _options_onError.call(_options, error);
         }
       });
@@ -68,7 +67,7 @@ function renderToPipe(rootElement, context, options) {
       return injectableStream;
     } catch (err) {
       var _ssrContext1;
-      (_ssrContext1 = ssrContext) === null || _ssrContext1 === void 0 ? void 0 : _ssrContext1.metrics.emitCounter("app.render.streaming.shell.error", 1);
+      (_ssrContext1 = ssrContext) === null || _ssrContext1 === void 0 ? void 0 : _ssrContext1.tracker.trackError(_tracker.SSRErrors.RENDER_SHELL, err);
       const { shellAfter: shellAfter2, shellBefore: shellBefore2 } = (0, _template.getTemplates)(context, _types.RenderLevel.CLIENT_RENDER);
       const fallbackHtml = `${shellBefore2}${shellAfter2}`;
       return fallbackHtml;

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

@@ -152,7 +152,7 @@ class Entry {
     this.entryName = entryName;
     this.App = options.App;
     this.pluginConfig = config;
-    this.tracker = (0, _tracker.createSSRTracker)(ctx);
+    this.tracker = ctx.tracker;
     this.metrics = ctx.metrics;
     this.htmlModifiers = ctx.htmlModifiers;
     this.nonce = nonce;

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

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

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

@@ -1,5 +1,6 @@
 import { useRouteLoaderData as useRouteData } from "@modern-js/utils/runtime/router";
 import { routerPlugin } from "./plugin";
+export { renderRoutes } from "./utils";
 export default routerPlugin;
 export { modifyRoutes } from "./plugin";
 export * from "./withRouter";

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 = [];
           }

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

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

@@ -4,6 +4,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 { 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

@@ -56,17 +56,10 @@ function renderToPipe(rootElement, context, options) {
         },
         onShellError: function onShellError(error) {
           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 = 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);
         }
       })).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) {
@@ -38,9 +39,7 @@ function renderToPipe(rootElement, context, options) {
               renderToReadableStream(rootElement, _object_spread_props(_object_spread({}, options), {
                 nonce: (_ssrContext = 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);
+                  var _options_onError, _options;
                   (_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 +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);
+            (_ssrContext1 = ssrContext) === null || _ssrContext1 === void 0 ? void 0 : _ssrContext1.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

@@ -14,7 +14,7 @@ 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/tracker.js

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

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

@@ -1,5 +1,6 @@
 import { useRouteLoaderData as useRouteData } from "@modern-js/utils/runtime/router";
 import { routerPlugin } from "./plugin";
+export { renderRoutes } from "./utils";
 export default routerPlugin;
 export { modifyRoutes } from "./plugin";
 export * from "./withRouter";

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

@@ -1,5 +1,6 @@
 import { formatServer } from "./utils";
 import render from "./serverRender";
+import { createSSRTracker } from "./serverRender/tracker";
 export const ssr = (config = {}) => ({
   name: "@modern-js/plugin-ssr",
   setup: () => {
@@ -16,6 +17,7 @@ export const ssr = (config = {}) => ({
         const { request } = context.ssrContext;
         context.ssrContext.request = formatServer(request);
         context.ssrContext.mode = config.mode;
+        context.ssrContext.tracker = createSSRTracker(context.ssrContext);
         if (!context.ssrContext.htmlModifiers) {
           context.ssrContext.htmlModifiers = [];
         }

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

@@ -11,7 +11,7 @@ export function buildShellAfterTemplate(afterAppTemplate, options) {
     return template.replace("<!--<?- SSRDataScript ?>-->", ssrDataScript);
     function buildSSRDataScript() {
       const { context: { ssrContext, initialData, __i18nData__ }, renderLevel } = options;
-      const { request, enableUnsafeCtx, nonce } = ssrContext;
+      const { request, enableUnsafeCtx, nonce, tracker } = ssrContext;
       const unsafeContext = {
         headers: request.headers
       };
@@ -21,6 +21,9 @@ export function buildShellAfterTemplate(afterAppTemplate, options) {
           i18nData: __i18nData__
         },
         context: {
+          reporter: {
+            sessionId: tracker.sessionId
+          },
           request: {
             params: request.params,
             query: request.query,

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

@@ -2,6 +2,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 { SSRErrors, SSRTimings } from "../tracker";
 import renderToPipe from "./renderToPipe";
 export const render = ({ App, context }) => {
   const { ssrContext } = context;
@@ -15,17 +16,25 @@ export const render = ({ App, context }) => {
         ssr: true
       })
     });
+    const { tracker } = ssrContext;
     const pipe = renderToPipe(rootElement, context, {
       onShellReady() {
         const cacheConfig = PreRender.config();
         if (cacheConfig) {
           ssrContext.cacheConfig = cacheConfig;
         }
+        const cost = end();
+        tracker.trackTiming(SSRTimings.SSR_RENDER_SHELL, cost);
       },
       onAllReady() {
         const cost = end();
-        ssrContext.logger.debug("App Render To HTML cost = %d ms", cost);
-        ssrContext.metrics.emitTimer("app.render.html.cost", cost);
+        tracker.trackTiming(SSRTimings.SSR_RENDER_TOTAL, cost);
+      },
+      onShellError(e) {
+        tracker.trackError(SSRErrors.RENDER_SHELL, e);
+      },
+      onError(error) {
+        tracker.trackError(SSRErrors.RENDER_STREAM, error);
       }
     });
     return pipe;

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

@@ -54,17 +54,10 @@ function renderToPipe(rootElement, context, options) {
         },
         onShellError(error) {
           var _options_onShellError, _options;
-          ssrContext.metrics.emitCounter("app.render.streaming.shell.error", 1);
           const { shellAfter, shellBefore } = getTemplates(context, RenderLevel.CLIENT_RENDER);
           const fallbackHtml = `${shellBefore}${shellAfter}`;
           resolve(fallbackHtml);
           (_options = options) === null || _options === void 0 ? void 0 : (_options_onShellError = _options.onShellError) === null || _options_onShellError === void 0 ? void 0 : _options_onShellError.call(_options, error);
-        },
-        onError(error) {
-          var _options_onError, _options;
-          ssrContext.logger.error("An error occurs during streaming SSR", error);
-          ssrContext.metrics.emitCounter("app.render.streaming.error", 1);
-          (_options = options) === null || _options === void 0 ? void 0 : (_options_onError = _options.onError) === null || _options_onError === void 0 ? void 0 : _options_onError.call(_options, error);
         }
       });
     });

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

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

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

@@ -8,7 +8,7 @@ import helmetReplace from "../helmet";
 import { RenderLevel } from "../types";
 import prefetch from "../../prefetch";
 import { ROUTER_DATA_JSON_ID, SSR_DATA_JSON_ID, attributesToString } from "../utils";
-import { SSRErrors, SSRTimings, createSSRTracker } from "../tracker";
+import { SSRErrors, SSRTimings } from "../tracker";
 import { createLoadableCollector } from "./loadable";
 import { createRender } from "./render";
 import { createStyledCollector } from "./styledComponent";
@@ -141,7 +141,7 @@ class Entry {
     this.entryName = entryName;
     this.App = options.App;
     this.pluginConfig = config;
-    this.tracker = createSSRTracker(ctx);
+    this.tracker = ctx.tracker;
     this.metrics = ctx.metrics;
     this.htmlModifiers = ctx.htmlModifiers;
     this.nonce = nonce;

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

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

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

@@ -2,6 +2,7 @@ import { useRouteLoaderData as useRouteData } from '@modern-js/utils/runtime/rou
 import { routerPlugin } from './plugin';
 import type { SingleRouteConfig, RouterConfig } from './types';
 export type { SingleRouteConfig, RouterConfig };
+export { renderRoutes } from './utils';
 export default routerPlugin;
 export { modifyRoutes } from './plugin';
 export * from './withRouter';

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

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

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

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

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

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

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

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

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.34.0",
+  "version": "2.35.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.34.0",
-    "@modern-js/types": "2.34.0",
-    "@modern-js/utils": "2.34.0"
+    "@modern-js/plugin": "2.35.0",
+    "@modern-js/types": "2.35.0",
+    "@modern-js/utils": "2.35.0"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -196,11 +196,11 @@
     "ts-jest": "^29.1.0",
     "typescript": "^5",
     "webpack": "^5.88.1",
-    "@modern-js/app-tools": "2.34.0",
-    "@modern-js/core": "2.34.0",
-    "@modern-js/server-core": "2.34.0",
-    "@scripts/build": "2.34.0",
-    "@scripts/jest-config": "2.34.0"
+    "@modern-js/app-tools": "2.35.0",
+    "@modern-js/core": "2.35.0",
+    "@modern-js/server-core": "2.35.0",
+    "@scripts/build": "2.35.0",
+    "@scripts/jest-config": "2.35.0"
   },
   "sideEffects": false,
   "publishConfig": {