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

package/dist/cjs/ssr/index.js

@@ -28,128 +28,126 @@ const _withCallback = require("./react/withCallback");
 const _utils = require("./utils");
 const _utils1 = require("./serverRender/utils");
 _export_star._(require("./react"), exports);
-const ssr = (config) => {
-  return {
-    name: "@modern-js/plugin-ssr",
-    setup: () => {
-      const mockResp = (0, _utils.mockResponse)();
-      if (config.inlineScript === false) {
-        window._SSR_DATA = (0, _runtimebrowser.parsedJSONFromElement)(_utils1.SSR_DATA_JSON_ID);
-        window._ROUTER_DATA = (0, _runtimebrowser.parsedJSONFromElement)(_utils1.ROUTER_DATA_JSON_ID);
-      }
-      return {
-        client: async ({ App, context, ModernRender, ModernHydrate }) => {
-          var _window__SSR_DATA;
-          const hydrateContext = {
-            ...context,
-            get routes() {
-              return context.routes;
-            },
-            _hydration: true
-          };
-          const callback = () => {
-            delete hydrateContext._hydration;
-          };
-          const 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) || _types.RenderLevel.CLIENT_RENDER;
-          if ((0, _utils.isReact18)() && config.mode === "stream") {
-            return streamSSRHydrate();
-          }
-          return stringSSRHydrate();
-          function stringSSRHydrate() {
-            if (renderLevel === _types.RenderLevel.CLIENT_RENDER || renderLevel === _types.RenderLevel.SERVER_PREFETCH) {
-              ModernRender(/* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
-                context
-              }));
-            } else if (renderLevel === _types.RenderLevel.SERVER_RENDER) {
-              const loadableReadyOptions = {
-                chunkLoadingGlobal: config.chunkLoadingGlobal
-              };
-              if ((0, _utils.isReact18)()) {
-                (0, _component.loadableReady)(() => {
-                  let SSRApp = () => /* @__PURE__ */ (0, _jsxruntime.jsx)(_withCallback.WithCallback, {
-                    callback,
-                    children: /* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
-                      context: hydrateContext
-                    })
-                  });
-                  SSRApp = (0, _hoistnonreactstatics.default)(SSRApp, App);
-                  ModernHydrate(/* @__PURE__ */ (0, _jsxruntime.jsx)(SSRApp, {}));
-                }, loadableReadyOptions);
-              } else {
-                (0, _component.loadableReady)(() => {
-                  ModernHydrate(/* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
+const ssr = (config) => ({
+  name: "@modern-js/plugin-ssr",
+  setup: () => {
+    const mockResp = (0, _utils.mockResponse)();
+    if (config.inlineScript === false) {
+      window._SSR_DATA = (0, _runtimebrowser.parsedJSONFromElement)(_utils1.SSR_DATA_JSON_ID);
+      window._ROUTER_DATA = (0, _runtimebrowser.parsedJSONFromElement)(_utils1.ROUTER_DATA_JSON_ID);
+    }
+    return {
+      client: async ({ App, context, ModernRender, ModernHydrate }) => {
+        var _window__SSR_DATA, _window;
+        const hydrateContext = {
+          ...context,
+          get routes() {
+            return context.routes;
+          },
+          _hydration: true
+        };
+        const callback = () => {
+          delete hydrateContext._hydration;
+        };
+        const 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) || _types.RenderLevel.CLIENT_RENDER;
+        if ((0, _utils.isReact18)() && config.mode === "stream") {
+          return streamSSRHydrate();
+        }
+        return stringSSRHydrate();
+        function stringSSRHydrate() {
+          if (renderLevel === _types.RenderLevel.CLIENT_RENDER || renderLevel === _types.RenderLevel.SERVER_PREFETCH) {
+            ModernRender(/* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
+              context
+            }));
+          } else if (renderLevel === _types.RenderLevel.SERVER_RENDER) {
+            const loadableReadyOptions = {
+              chunkLoadingGlobal: config.chunkLoadingGlobal
+            };
+            if ((0, _utils.isReact18)()) {
+              (0, _component.loadableReady)(() => {
+                let SSRApp = () => /* @__PURE__ */ (0, _jsxruntime.jsx)(_withCallback.WithCallback, {
+                  callback,
+                  children: /* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
                     context: hydrateContext
-                  }), callback);
-                }, loadableReadyOptions);
-              }
+                  })
+                });
+                SSRApp = (0, _hoistnonreactstatics.default)(SSRApp, App);
+                ModernHydrate(/* @__PURE__ */ (0, _jsxruntime.jsx)(SSRApp, {}));
+              }, loadableReadyOptions);
             } else {
-              console.warn(`unknow render level: ${renderLevel}, execute render()`);
-              ModernRender(/* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
-                context
-              }));
-            }
-          }
-          function streamSSRHydrate() {
-            if (renderLevel === _types.RenderLevel.SERVER_RENDER) {
-              let SSRApp = () => /* @__PURE__ */ (0, _jsxruntime.jsx)(_withCallback.WithCallback, {
-                callback,
-                children: /* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
+              (0, _component.loadableReady)(() => {
+                ModernHydrate(/* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
                   context: hydrateContext
-                })
-              });
-              SSRApp = (0, _hoistnonreactstatics.default)(SSRApp, App);
-              ModernHydrate(/* @__PURE__ */ (0, _jsxruntime.jsx)(SSRApp, {}));
-            } else {
-              ModernRender(/* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
-                context
-              }));
+                }), callback);
+              }, loadableReadyOptions);
             }
-          }
-        },
-        init({ context }, next) {
-          var _window__SSR_DATA, _window__SSR_DATA_context;
-          const 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;
-          if (!request) {
-            context.ssrContext = {
-              ...context.ssrContext,
-              response: mockResp,
-              request: (0, _utils.formatClient)({})
-            };
-            return next({
+          } else {
+            console.warn(`unknow render level: ${renderLevel}, execute render()`);
+            ModernRender(/* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
               context
+            }));
+          }
+        }
+        function streamSSRHydrate() {
+          if (renderLevel === _types.RenderLevel.SERVER_RENDER) {
+            let SSRApp = () => /* @__PURE__ */ (0, _jsxruntime.jsx)(_withCallback.WithCallback, {
+              callback,
+              children: /* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
+                context: hydrateContext
+              })
             });
+            SSRApp = (0, _hoistnonreactstatics.default)(SSRApp, App);
+            ModernHydrate(/* @__PURE__ */ (0, _jsxruntime.jsx)(SSRApp, {}));
+          } else {
+            ModernRender(/* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
+              context
+            }));
           }
-          context.ssrContext.response = mockResp;
-          context.ssrContext.request = (0, _utils.formatClient)(request);
+        }
+      },
+      init({ context }, next) {
+        var _window__SSR_DATA_context, _window__SSR_DATA, _window;
+        const 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 = {
+            ...context.ssrContext,
+            response: mockResp,
+            request: (0, _utils.formatClient)({})
+          };
           return next({
             context
           });
-        },
-        pickContext: ({ context, pickedContext }, next) => {
-          var _window__SSR_DATA, _window__SSR_DATA_context;
-          const 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;
-          const { initialData } = context;
-          if (!request) {
-            return next({
-              context,
-              pickedContext: {
-                ...pickedContext,
-                initialData
-              }
-            });
-          }
+        }
+        context.ssrContext.response = mockResp;
+        context.ssrContext.request = (0, _utils.formatClient)(request);
+        return next({
+          context
+        });
+      },
+      pickContext: ({ context, pickedContext }, next) => {
+        var _window__SSR_DATA_context, _window__SSR_DATA, _window;
+        const 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;
+        const { initialData } = context;
+        if (!request) {
           return next({
             context,
             pickedContext: {
               ...pickedContext,
-              initialData,
-              request,
-              response: mockResp
+              initialData
             }
           });
         }
-      };
-    }
-  };
-};
+        return next({
+          context,
+          pickedContext: {
+            ...pickedContext,
+            initialData,
+            request,
+            response: mockResp
+          }
+        });
+      }
+    };
+  }
+});
 const _default = ssr;

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

@@ -22,42 +22,41 @@ const _interop_require_default = require("@swc/helpers/_/_interop_require_defaul
 const _utils = require("./utils");
 const _serverRender = /* @__PURE__ */ _interop_require_default._(require("./serverRender"));
 _export_star._(require("./react"), exports);
-const ssr = (config = {}) => {
-  return {
-    name: "@modern-js/plugin-ssr",
-    setup: () => {
-      return {
-        server: async ({ App, context }) => {
-          const html = await (0, _serverRender.default)({
-            context,
-            App,
-            config
-          });
-          return html;
-        },
-        init({ context }, next) {
-          const { request } = context.ssrContext;
-          context.ssrContext.request = (0, _utils.formatServer)(request);
-          context.ssrContext.mode = config.mode;
-          return next({
-            context
-          });
-        },
-        pickContext: ({ context, pickedContext }, next) => {
-          const { request, response } = context === null || context === void 0 ? void 0 : context.ssrContext;
-          const { initialData } = context;
-          return next({
-            context,
-            pickedContext: {
-              ...pickedContext,
-              initialData,
-              request,
-              response
-            }
-          });
-        }
-      };
-    }
-  };
-};
+const ssr = (config = {}) => ({
+  name: "@modern-js/plugin-ssr",
+  setup: () => {
+    return {
+      server: async ({ App, context }) => {
+        const html = await (0, _serverRender.default)({
+          context,
+          App,
+          config
+        });
+        return html;
+      },
+      init({ context }, next) {
+        const { request } = context.ssrContext;
+        context.ssrContext.request = (0, _utils.formatServer)(request);
+        context.ssrContext.mode = config.mode;
+        return next({
+          context
+        });
+      },
+      pickContext: ({ context, pickedContext }, next) => {
+        var _context;
+        const { request, response } = (_context = context) === null || _context === void 0 ? void 0 : _context.ssrContext;
+        const { initialData } = context;
+        return next({
+          context,
+          pickedContext: {
+            ...pickedContext,
+            initialData,
+            request,
+            response
+          }
+        });
+      }
+    };
+  }
+});
 const _default = ssr;

package/dist/cjs/ssr/prefetch.js

@@ -12,48 +12,46 @@ const _jsxruntime = require("react/jsx-runtime");
 const _server = require("react-dom/server");
 const _runtimenode = require("@modern-js/utils/runtime-node");
 const _server1 = require("@loadable/server");
-const prefetch = async (App, context) => {
-  return (0, _runtimenode.run)(context.ssrContext.request.headers, async () => {
-    var _context_store;
-    const { ssrContext } = context;
-    const { loadableStats } = ssrContext;
-    if (loadableStats) {
-      const extractor = new _server1.ChunkExtractor({
-        stats: loadableStats,
-        entrypoints: [
-          ssrContext.entryName
-        ].filter(Boolean)
-      });
-      (0, _server.renderToStaticMarkup)(extractor.collectChunks(/* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
-        context
-      })));
-    } else {
-      (0, _server.renderToStaticMarkup)(/* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
-        context
-      }));
-    }
-    if (!context.loaderManager.hasPendingLoaders()) {
-      return {
-        initialData: context.initialData,
-        i18nData: context.__i18nData__
-      };
-    }
-    const loadersData = await context.loaderManager.awaitPendingLoaders();
-    Object.keys(loadersData).forEach((id) => {
-      const data = loadersData[id];
-      if (data._error) {
-        ssrContext.logger.error("App Prefetch Loader", data._error);
-        ssrContext.metrics.emitCounter("app.prefetch.loader.error", 1);
-        delete data._error;
-      }
+const prefetch = async (App, context) => (0, _runtimenode.run)(context.ssrContext.request.headers, async () => {
+  var _context_store, _context;
+  const { ssrContext } = context;
+  const { loadableStats } = ssrContext;
+  if (loadableStats) {
+    const extractor = new _server1.ChunkExtractor({
+      stats: loadableStats,
+      entrypoints: [
+        ssrContext.entryName
+      ].filter(Boolean)
     });
+    (0, _server.renderToStaticMarkup)(extractor.collectChunks(/* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
+      context
+    })));
+  } else {
+    (0, _server.renderToStaticMarkup)(/* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
+      context
+    }));
+  }
+  if (!context.loaderManager.hasPendingLoaders()) {
     return {
-      loadersData,
       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()
+      i18nData: context.__i18nData__
     };
+  }
+  const loadersData = await context.loaderManager.awaitPendingLoaders();
+  Object.keys(loadersData).forEach((id) => {
+    const data = loadersData[id];
+    if (data._error) {
+      ssrContext.logger.error("App Prefetch Loader", data._error);
+      ssrContext.metrics.emitCounter("app.prefetch.loader.error", 1);
+      delete data._error;
+    }
   });
-};
+  return {
+    loadersData,
+    initialData: context.initialData,
+    i18nData: context.__i18nData__,
+    // todo: move to plugin state
+    storeState: (_context = context) === null || _context === void 0 ? void 0 : (_context_store = _context.store) === null || _context_store === void 0 ? void 0 : _context_store.getState()
+  };
+});
 const _default = prefetch;

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

@@ -55,8 +55,9 @@ const aggKeysFromPropsList = function aggKeysFromPropsList2(propsList, propName)
   }, {});
   const res = propsList.filter((props) => usefulObject(props[propName])).reduce((result, next) => {
     REQUEST_META.forEach((key) => {
+      var _prop;
       const 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]));
       }
     });
@@ -79,8 +80,9 @@ const aggMatchesFromPropsList = function aggMatchesFromPropsList2(propsList, pro
   }, {});
   const res = propsList.filter((props) => usefulObject(props[propName])).reduce((result, next) => {
     REQUEST_META.forEach((key) => {
+      var _prop;
       const 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/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/bulidTemplate.before.js

@@ -31,6 +31,7 @@ function getHeadTemplate(beforeEntryTemplate, context) {
   function injectCss(headTemplate2) {
     return headTemplate2.replace(_utils.CSS_CHUNKS_PLACEHOLDER, getCssChunks());
     function getCssChunks() {
+      var _matches;
       const { routeManifest, routerContext, routes } = context;
       if (!routeManifest || !routerContext || !routes) {
         return "";
@@ -38,7 +39,7 @@ function getHeadTemplate(beforeEntryTemplate, context) {
       const { routeAssets } = routeManifest;
       const cssChunks = [];
       const matches = (0, _router.matchRoutes)(routes, routerContext.location, routerContext.basename);
-      matches === null || matches === void 0 ? void 0 : matches.forEach((match, index) => {
+      (_matches = matches) === null || _matches === void 0 ? void 0 : _matches.forEach((match, index) => {
         if (!index) {
           return;
         }
@@ -48,7 +49,8 @@ function getHeadTemplate(beforeEntryTemplate, context) {
           if (routeManifest2) {
             const { referenceCssAssets = [] } = routeManifest2;
             const _cssChunks = referenceCssAssets.filter((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.push(..._cssChunks);
           }

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

@@ -23,6 +23,7 @@ function renderToPipe(rootElement, context, options) {
   const chunkVec = [];
   const forUserPipe = (stream) => {
     return new Promise((resolve) => {
+      var _ssrContext;
       let renderToPipeableStream;
       try {
         ({ renderToPipeableStream } = require("react-dom/server"));
@@ -30,11 +31,11 @@ function renderToPipe(rootElement, context, options) {
       }
       const { pipe } = renderToPipeableStream(rootElement, {
         ...options,
-        nonce: ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.nonce,
+        nonce: (_ssrContext = ssrContext) === null || _ssrContext === void 0 ? void 0 : _ssrContext.nonce,
         onShellReady() {
-          var _options_onShellReady;
+          var _options_onShellReady, _options;
           const { shellAfter, shellBefore } = (0, _template.getTemplates)(context, _types.RenderLevel.SERVER_RENDER);
-          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);
           const injectableTransform = new _stream.Transform({
             transform(chunk, _encoding, callback) {
               try {
@@ -62,18 +63,18 @@ function renderToPipe(rootElement, context, options) {
           resolve(pipe(injectableTransform).pipe(stream));
         },
         onShellError(error) {
-          var _options_onShellError;
+          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 === 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(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);
         }
       });
     });

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

@@ -28,14 +28,15 @@ function renderToPipe(rootElement, context, options) {
     }
     const { shellAfter, shellBefore } = (0, _template.getTemplates)(context, _types.RenderLevel.SERVER_RENDER);
     try {
+      var _ssrContext;
       const readableOriginal = await renderToReadableStream(rootElement, {
         ...options,
-        nonce: ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.nonce,
+        nonce: (_ssrContext = ssrContext) === null || _ssrContext === void 0 ? void 0 : _ssrContext.nonce,
         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);
         }
       });
       const reader = readableOriginal.getReader();
@@ -66,7 +67,8 @@ function renderToPipe(rootElement, context, options) {
       });
       return injectableStream;
     } catch (err) {
-      ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.metrics.emitCounter("app.render.streaming.shell.error", 1);
+      var _ssrContext1;
+      (_ssrContext1 = ssrContext) === null || _ssrContext1 === void 0 ? void 0 : _ssrContext1.metrics.emitCounter("app.render.streaming.shell.error", 1);
       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

@@ -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;