@modern-js/runtime 2.44.0 → 2.45.1-alpha.0

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

@@ -111,6 +111,9 @@ const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
           const routerContext = await query(remixRequest, {
             requestContext
           });
+          if ("errors" in routerContext && routerContext.errors && Object.keys(routerContext.errors).length > 0) {
+            throw new Error(Object.values(routerContext.errors)[0]);
+          }
           const cost = end();
           reporter.reportTiming(import_constants.LOADER_REPORTER_NAME, cost);
           serverTiming.addServeTiming(import_constants.LOADER_REPORTER_NAME, cost);

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

@@ -154,24 +154,20 @@ const ssrPlugin = () => ({
       },
       modifyEntryRuntimePlugins({ entrypoint, plugins, bundlerConfigs }) {
         if (ssrConfigMap.get(entrypoint.entryName)) {
-          var _bundlerConfigs_find_output, _bundlerConfigs_find, _config_server, _config_server1;
+          var _bundlerConfigs_find_output, _bundlerConfigs_find;
           const chunkLoadingGlobal = bundlerConfigs === null || bundlerConfigs === void 0 ? void 0 : (_bundlerConfigs_find = bundlerConfigs.find((config2) => 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;
           const config = api.useResolvedConfigContext();
           const { enableInlineScripts, enableInlineStyles } = config.output;
           const { crossorigin, scriptLoading } = config.html;
-          const disablePrerender = typeof ((_config_server = config.server) === null || _config_server === void 0 ? void 0 : _config_server.ssr) === "object" ? Boolean(config.server.ssr.disablePrerender) : false;
-          const unsafeHeaders = typeof ((_config_server1 = config.server) === null || _config_server1 === void 0 ? void 0 : _config_server1.ssr) === "object" ? config.server.ssr.unsafeHeaders : void 0;
           plugins.push({
             name: PLUGIN_IDENTIFIER,
             options: JSON.stringify({
+              scriptLoading,
               ...ssrConfigMap.get(entrypoint.entryName) || {},
               crossorigin,
-              scriptLoading,
               chunkLoadingGlobal,
-              disablePrerender,
               enableInlineScripts: typeof enableInlineScripts === "function" ? void 0 : enableInlineScripts,
-              enableInlineStyles: typeof enableInlineStyles === "function" ? void 0 : enableInlineStyles,
-              unsafeHeaders
+              enableInlineStyles: typeof enableInlineStyles === "function" ? void 0 : enableInlineStyles
             })
           });
         }

package/dist/cjs/ssr/prefetch.js

@@ -77,8 +77,7 @@ const prefetch = async (App, context, config, tracker) => (0, import_node.run)(c
   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);
+      ssrContext.logger.error("App Load use-loader", data._error);
       delete data._error;
     }
   });

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

@@ -31,7 +31,9 @@ var ShellChunkStatus;
   ShellChunkStatus2[ShellChunkStatus2["FINIESH"] = 1] = "FINIESH";
 })(ShellChunkStatus || (ShellChunkStatus = {}));
 function renderToPipe(rootElement, context, pluginConfig, options) {
+  var _context_ssrContext;
   let shellChunkStatus = 0;
+  const onReady = ((_context_ssrContext = context.ssrContext) === null || _context_ssrContext === void 0 ? void 0 : _context_ssrContext.isSpider) ? "onAllReady" : "onShellReady";
   const { ssrContext } = context;
   const chunkVec = [];
   const forUserPipe = (stream) => {
@@ -44,7 +46,7 @@ function renderToPipe(rootElement, context, pluginConfig, options) {
       const { pipe } = renderToPipeableStream(rootElement, {
         ...options,
         nonce: ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.nonce,
-        onShellReady() {
+        [onReady]() {
           (0, import_template.getTemplates)(context, import_types.RenderLevel.SERVER_RENDER, pluginConfig).then(({ shellAfter, shellBefore }) => {
             var _options_onShellReady;
             options === null || options === void 0 ? void 0 : (_options_onShellReady = options.onShellReady) === null || _options_onShellReady === void 0 ? void 0 : _options_onShellReady.call(options);

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

@@ -42,6 +42,7 @@ function renderToPipe(rootElement, context, pluginConfig, options) {
     }
     const { shellAfter, shellBefore } = await (0, import_template.getTemplates)(context, import_types.RenderLevel.SERVER_RENDER, pluginConfig);
     try {
+      var _context_ssrContext;
       const readableOriginal = await renderToReadableStream(rootElement, {
         ...options,
         nonce: ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.nonce,
@@ -50,6 +51,9 @@ function renderToPipe(rootElement, context, pluginConfig, options) {
           options === null || options === void 0 ? void 0 : (_options_onError = options.onError) === null || _options_onError === void 0 ? void 0 : _options_onError.call(options, error);
         }
       });
+      if ((_context_ssrContext = context.ssrContext) === null || _context_ssrContext === void 0 ? void 0 : _context_ssrContext.isSpider) {
+        await readableOriginal.allReady;
+      }
       const reader = readableOriginal.getReader();
       const injectableStream = new ReadableStream({
         start(controller) {

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

@@ -161,7 +161,6 @@ class Entry {
   constructor(options) {
     (0, import_define_property._)(this, "entryName", void 0);
     (0, import_define_property._)(this, "result", void 0);
-    (0, import_define_property._)(this, "metrics", void 0);
     (0, import_define_property._)(this, "tracker", void 0);
     (0, import_define_property._)(this, "template", void 0);
     (0, import_define_property._)(this, "App", void 0);
@@ -177,7 +176,6 @@ class Entry {
     this.pluginConfig = config;
     this.routeManifest = ctx.routeManifest;
     this.tracker = ctx.tracker;
-    this.metrics = ctx.metrics;
     this.htmlModifiers = ctx.htmlModifiers;
     this.nonce = nonce;
     this.result = {

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

@@ -41,7 +41,6 @@ const render = ({ App, context, config }) => {
       App,
       config
     });
-    entry.metrics.emitCounter("app.visit.count", 1);
     const html = await entry.renderToHtml(context);
     return html;
   });

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

@@ -105,7 +105,8 @@ class LoadableCollector {
     const { scriptLoading = "defer", enableInlineScripts } = config;
     const scriptLoadingAtr = {
       defer: scriptLoading === "defer" ? true : void 0,
-      type: scriptLoading === "module" ? "module" : void 0
+      type: scriptLoading === "module" ? "module" : void 0,
+      async: scriptLoading === "async" ? true : void 0
     };
     const attributes = (0, import_utils.attributesToString)(this.generateAttributes({
       nonce,

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

@@ -41,69 +41,57 @@ var SSRErrors;
 const errors = {
   [0]: {
     reporter: "App Prerender",
-    logger: "App Prerender",
-    metrics: "app.prerender.error"
+    logger: "App Prerender"
   },
   [1]: {
     reporter: "App run useLoader",
-    logger: "App run useLoader",
-    metrics: "app.useloader.error"
+    logger: "App run useLoader"
   },
   [2]: {
     reporter: "App Render To HTML",
-    logger: "App Render To HTML",
-    metrics: "app.render.html.error"
+    logger: "App Render To HTML"
   },
   [3]: {
     reporter: "App Render To Streaming",
-    logger: "An error occurs during streaming SSR",
-    metrics: "app.render.streaming.error"
+    logger: "An error occurs during streaming SSR"
   },
-  [4]: {
-    metrics: "app.render.streaming.shell.error"
-  }
+  [4]: {}
 };
 const timings = {
   [0]: {
     reporter: "ssr-prerender",
     serverTiming: "ssr-prerender",
-    metrics: "app.prerender.cost",
     logger: "App Prerender cost = %d ms"
   },
   [1]: {
     reporter: "ssr-render-html",
     serverTiming: "ssr-render-html",
-    metrics: "app.render.html.cost",
     logger: "App Render To HTML cost = %d ms"
   },
   [2]: {
     reporter: "ssr-render-shell",
-    metrics: "app.render.shell.cost",
     logger: "App Render To Shell cost = %d ms"
   },
   [3]: {
     reporter: "use-loader",
     serverTiming: "use-loader",
-    metrics: "app.useloader.cost",
     logger: "App run useLoader cost = %d ms"
   }
 };
-function createSSRTracker({ reporter, serverTiming, metrics, logger }) {
+function createSSRTracker({ reporter, serverTiming, logger }) {
   const tracker = {
     get sessionId() {
       return reporter.sessionId;
     },
     trackError(key, e) {
-      const { reporter: reporterContent, metrics: metricsContent, logger: loggerContent } = errors[key];
+      const { reporter: reporterContent, logger: loggerContent } = errors[key];
       reporterContent && reporter.reportError(`SSR Error - ${reporterContent}`, e);
-      metricsContent && metrics.emitCounter(metricsContent, 1);
       loggerContent && logger.error(loggerContent, e);
     },
     trackTiming(key, cost) {
-      const { reporter: reporterName, serverTiming: serverTimingName, logger: loggerName, metrics: metricsName } = timings[key];
+      const { reporter: reporterName, serverTiming: serverTimingName, logger: loggerName } = timings[key];
       reporterName && reporter.reportTiming(reporterName, cost);
       serverTimingName && serverTiming.addServeTiming(serverTimingName, cost);
-      metricsName && metrics.emitTimer(metricsName, cost);
       loggerName && logger.debug(loggerName, cost);
     }
   };

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

@@ -131,6 +131,9 @@ var routerPlugin = function(param) {
                   ];
                 case 1:
                   routerContext = _state.sent();
+                  if ("errors" in routerContext && routerContext.errors && Object.keys(routerContext.errors).length > 0) {
+                    throw new Error(Object.values(routerContext.errors)[0]);
+                  }
                   cost = end();
                   reporter.reportTiming(LOADER_REPORTER_NAME, cost);
                   serverTiming.addServeTiming(LOADER_REPORTER_NAME, cost);

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

@@ -146,25 +146,22 @@ var ssrPlugin = function() {
         modifyEntryRuntimePlugins: function modifyEntryRuntimePlugins(param) {
           var entrypoint = param.entrypoint, plugins = param.plugins, bundlerConfigs = param.bundlerConfigs;
           if (ssrConfigMap.get(entrypoint.entryName)) {
-            var _bundlerConfigs_find_output, _bundlerConfigs_find, _config_server, _config_server1;
+            var _bundlerConfigs_find_output, _bundlerConfigs_find;
             var chunkLoadingGlobal = bundlerConfigs === null || bundlerConfigs === void 0 ? void 0 : (_bundlerConfigs_find = bundlerConfigs.find(function(config2) {
               return config2.name === "client";
             })) === null || _bundlerConfigs_find === void 0 ? void 0 : (_bundlerConfigs_find_output = _bundlerConfigs_find.output) === null || _bundlerConfigs_find_output === void 0 ? void 0 : _bundlerConfigs_find_output.chunkLoadingGlobal;
             var config = api.useResolvedConfigContext();
             var _config_output = config.output, enableInlineScripts = _config_output.enableInlineScripts, enableInlineStyles = _config_output.enableInlineStyles;
             var _config_html = config.html, crossorigin = _config_html.crossorigin, scriptLoading = _config_html.scriptLoading;
-            var disablePrerender = typeof ((_config_server = config.server) === null || _config_server === void 0 ? void 0 : _config_server.ssr) === "object" ? Boolean(config.server.ssr.disablePrerender) : false;
-            var unsafeHeaders = typeof ((_config_server1 = config.server) === null || _config_server1 === void 0 ? void 0 : _config_server1.ssr) === "object" ? config.server.ssr.unsafeHeaders : void 0;
             plugins.push({
               name: PLUGIN_IDENTIFIER,
-              options: JSON.stringify(_object_spread_props(_object_spread({}, ssrConfigMap.get(entrypoint.entryName) || {}), {
+              options: JSON.stringify(_object_spread_props(_object_spread({
+                scriptLoading
+              }, ssrConfigMap.get(entrypoint.entryName) || {}), {
                 crossorigin,
-                scriptLoading,
                 chunkLoadingGlobal,
-                disablePrerender,
                 enableInlineScripts: typeof enableInlineScripts === "function" ? void 0 : enableInlineScripts,
-                enableInlineStyles: typeof enableInlineStyles === "function" ? void 0 : enableInlineStyles,
-                unsafeHeaders
+                enableInlineStyles: typeof enableInlineStyles === "function" ? void 0 : enableInlineStyles
               }))
             });
           }

package/dist/esm/ssr/prefetch.js

@@ -84,8 +84,7 @@ var prefetch = function() {
                 Object.keys(loadersData).forEach(function(id) {
                   var data = loadersData[id];
                   if (data._error) {
-                    ssrContext.logger.error("App Prefetch Loader", data._error);
-                    ssrContext.metrics.emitCounter("app.prefetch.loader.error", 1);
+                    ssrContext.logger.error("App Load use-loader", data._error);
                     delete data._error;
                   }
                 });

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

@@ -1,3 +1,4 @@
+import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
@@ -11,7 +12,9 @@ var ShellChunkStatus;
   ShellChunkStatus2[ShellChunkStatus2["FINIESH"] = 1] = "FINIESH";
 })(ShellChunkStatus || (ShellChunkStatus = {}));
 function renderToPipe(rootElement, context, pluginConfig, options) {
+  var _context_ssrContext;
   var shellChunkStatus = 0;
+  var onReady = ((_context_ssrContext = context.ssrContext) === null || _context_ssrContext === void 0 ? void 0 : _context_ssrContext.isSpider) ? "onAllReady" : "onShellReady";
   var ssrContext = context.ssrContext;
   var chunkVec = [];
   var forUserPipe = function(stream) {
@@ -21,50 +24,49 @@ function renderToPipe(rootElement, context, pluginConfig, options) {
         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,
-        onShellReady: function onShellReady() {
-          getTemplates(context, RenderLevel.SERVER_RENDER, pluginConfig).then(function(param) {
-            var shellAfter = param.shellAfter, shellBefore = param.shellBefore;
-            var _options_onShellReady;
-            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 {
-                  if (shellChunkStatus !== 1) {
-                    chunkVec.push(chunk.toString());
-                    var concatedChunk = chunkVec.join("");
-                    if (concatedChunk.endsWith(ESCAPED_SHELL_STREAM_END_MARK)) {
-                      concatedChunk = concatedChunk.replace(ESCAPED_SHELL_STREAM_END_MARK, "");
-                      shellChunkStatus = 1;
-                      this.push("".concat(shellBefore).concat(concatedChunk).concat(shellAfter));
-                    }
-                  } else {
-                    this.push(chunk);
-                  }
-                  callback();
-                } catch (e) {
-                  if (_instanceof(e, Error)) {
-                    callback(e);
-                  } else {
-                    callback(new Error("Received unkown error when streaming"));
+      var _obj;
+      var pipe = renderToPipeableStream(rootElement, _object_spread_props(_object_spread({}, options), (_obj = {
+        nonce: ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.nonce
+      }, _define_property(_obj, onReady, function() {
+        getTemplates(context, RenderLevel.SERVER_RENDER, pluginConfig).then(function(param) {
+          var shellAfter = param.shellAfter, shellBefore = param.shellBefore;
+          var _options_onShellReady;
+          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 {
+                if (shellChunkStatus !== 1) {
+                  chunkVec.push(chunk.toString());
+                  var concatedChunk = chunkVec.join("");
+                  if (concatedChunk.endsWith(ESCAPED_SHELL_STREAM_END_MARK)) {
+                    concatedChunk = concatedChunk.replace(ESCAPED_SHELL_STREAM_END_MARK, "");
+                    shellChunkStatus = 1;
+                    this.push("".concat(shellBefore).concat(concatedChunk).concat(shellAfter));
                   }
+                } else {
+                  this.push(chunk);
+                }
+                callback();
+              } catch (e) {
+                if (_instanceof(e, Error)) {
+                  callback(e);
+                } else {
+                  callback(new Error("Received unkown error when streaming"));
                 }
               }
-            });
-            resolve(pipe(injectableTransform).pipe(stream));
-          });
-        },
-        onShellError: function onShellError(error) {
-          getTemplates(context, RenderLevel.CLIENT_RENDER, pluginConfig).then(function(param) {
-            var shellAfter = param.shellAfter, shellBefore = param.shellBefore;
-            var _options_onShellError;
-            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);
+            }
           });
-        }
-      })).pipe;
+          resolve(pipe(injectableTransform).pipe(stream));
+        });
+      }), _define_property(_obj, "onShellError", function onShellError(error) {
+        getTemplates(context, RenderLevel.CLIENT_RENDER, pluginConfig).then(function(param) {
+          var shellAfter = param.shellAfter, shellBefore = param.shellBefore;
+          var _options_onShellError;
+          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);
+        });
+      }), _obj))).pipe;
     });
   };
   return forUserPipe;

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

@@ -17,7 +17,7 @@ function renderToPipe(rootElement, context, pluginConfig, options) {
   var ssrContext = context.ssrContext;
   var forUserPipe = function() {
     var _ref = _async_to_generator(function() {
-      var renderToReadableStream, _ref2, shellAfter, shellBefore, readableOriginal, reader, injectableStream, err, _ref1, shellAfter1, shellBefore1, fallbackHtml;
+      var renderToReadableStream, _ref2, shellAfter, shellBefore, _context_ssrContext, readableOriginal, reader, injectableStream, err, _ref1, shellAfter1, shellBefore1, fallbackHtml;
       return _ts_generator(this, function(_state) {
         switch (_state.label) {
           case 0:
@@ -35,9 +35,9 @@ function renderToPipe(rootElement, context, pluginConfig, options) {
           case 2:
             _state.trys.push([
               2,
-              4,
+              6,
               ,
-              6
+              8
             ]);
             return [
               4,
@@ -51,6 +51,19 @@ function renderToPipe(rootElement, context, pluginConfig, options) {
             ];
           case 3:
             readableOriginal = _state.sent();
+            if (!((_context_ssrContext = context.ssrContext) === null || _context_ssrContext === void 0 ? void 0 : _context_ssrContext.isSpider))
+              return [
+                3,
+                5
+              ];
+            return [
+              4,
+              readableOriginal.allReady
+            ];
+          case 4:
+            _state.sent();
+            _state.label = 5;
+          case 5:
             reader = readableOriginal.getReader();
             injectableStream = new ReadableStream({
               start: function start(controller) {
@@ -103,21 +116,21 @@ function renderToPipe(rootElement, context, pluginConfig, options) {
               2,
               injectableStream
             ];
-          case 4:
+          case 6:
             err = _state.sent();
             ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.tracker.trackError(SSRErrors.RENDER_SHELL, err);
             return [
               4,
               getTemplates(context, RenderLevel.CLIENT_RENDER, pluginConfig)
             ];
-          case 5:
+          case 7:
             _ref1 = _state.sent(), shellAfter1 = _ref1.shellAfter, shellBefore1 = _ref1.shellBefore;
             fallbackHtml = "".concat(shellBefore1).concat(shellAfter1);
             return [
               2,
               fallbackHtml
             ];
-          case 6:
+          case 8:
             return [
               2
             ];

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

@@ -54,7 +54,6 @@ var Entry = /* @__PURE__ */ function() {
     _class_call_check(this, Entry2);
     _define_property(this, "entryName", void 0);
     _define_property(this, "result", void 0);
-    _define_property(this, "metrics", void 0);
     _define_property(this, "tracker", void 0);
     _define_property(this, "template", void 0);
     _define_property(this, "App", void 0);
@@ -70,7 +69,6 @@ var Entry = /* @__PURE__ */ function() {
     this.pluginConfig = config;
     this.routeManifest = ctx.routeManifest;
     this.tracker = ctx.tracker;
-    this.metrics = ctx.metrics;
     this.htmlModifiers = ctx.htmlModifiers;
     this.nonce = nonce;
     this.result = {

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

@@ -15,7 +15,6 @@ var render = function(param) {
             App,
             config
           });
-          entry.metrics.emitCounter("app.visit.count", 1);
           return [
             4,
             entry.renderToHtml(context)

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

@@ -164,7 +164,8 @@ var LoadableCollector = /* @__PURE__ */ function() {
                 _config_scriptLoading = config.scriptLoading, scriptLoading = _config_scriptLoading === void 0 ? "defer" : _config_scriptLoading, enableInlineScripts = config.enableInlineScripts;
                 scriptLoadingAtr = {
                   defer: scriptLoading === "defer" ? true : void 0,
-                  type: scriptLoading === "module" ? "module" : void 0
+                  type: scriptLoading === "module" ? "module" : void 0,
+                  async: scriptLoading === "async" ? true : void 0
                 };
                 attributes = attributesToString(_this.generateAttributes(_object_spread({
                   nonce

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

@@ -17,61 +17,49 @@ var SSRErrors;
 var _obj;
 var errors = (_obj = {}, _define_property(_obj, 0, {
   reporter: "App Prerender",
-  logger: "App Prerender",
-  metrics: "app.prerender.error"
+  logger: "App Prerender"
 }), _define_property(_obj, 1, {
   reporter: "App run useLoader",
-  logger: "App run useLoader",
-  metrics: "app.useloader.error"
+  logger: "App run useLoader"
 }), _define_property(_obj, 2, {
   reporter: "App Render To HTML",
-  logger: "App Render To HTML",
-  metrics: "app.render.html.error"
+  logger: "App Render To HTML"
 }), _define_property(_obj, 3, {
   reporter: "App Render To Streaming",
-  logger: "An error occurs during streaming SSR",
-  metrics: "app.render.streaming.error"
-}), _define_property(_obj, 4, {
-  metrics: "app.render.streaming.shell.error"
-}), _obj);
+  logger: "An error occurs during streaming SSR"
+}), _define_property(_obj, 4, {}), _obj);
 var _obj1;
 var timings = (_obj1 = {}, _define_property(_obj1, 0, {
   reporter: "ssr-prerender",
   serverTiming: "ssr-prerender",
-  metrics: "app.prerender.cost",
   logger: "App Prerender cost = %d ms"
 }), _define_property(_obj1, 1, {
   reporter: "ssr-render-html",
   serverTiming: "ssr-render-html",
-  metrics: "app.render.html.cost",
   logger: "App Render To HTML cost = %d ms"
 }), _define_property(_obj1, 2, {
   reporter: "ssr-render-shell",
-  metrics: "app.render.shell.cost",
   logger: "App Render To Shell cost = %d ms"
 }), _define_property(_obj1, 3, {
   reporter: "use-loader",
   serverTiming: "use-loader",
-  metrics: "app.useloader.cost",
   logger: "App run useLoader cost = %d ms"
 }), _obj1);
 function createSSRTracker(param) {
-  var reporter = param.reporter, serverTiming = param.serverTiming, metrics = param.metrics, logger = param.logger;
+  var reporter = param.reporter, serverTiming = param.serverTiming, logger = param.logger;
   var tracker = {
     get sessionId() {
       return reporter.sessionId;
     },
     trackError: function trackError(key, e) {
-      var _errors_key = errors[key], reporterContent = _errors_key.reporter, metricsContent = _errors_key.metrics, loggerContent = _errors_key.logger;
+      var _errors_key = errors[key], reporterContent = _errors_key.reporter, loggerContent = _errors_key.logger;
       reporterContent && reporter.reportError("SSR Error - ".concat(reporterContent), e);
-      metricsContent && metrics.emitCounter(metricsContent, 1);
       loggerContent && logger.error(loggerContent, e);
     },
     trackTiming: function trackTiming(key, cost) {
-      var _timings_key = timings[key], reporterName = _timings_key.reporter, serverTimingName = _timings_key.serverTiming, loggerName = _timings_key.logger, metricsName = _timings_key.metrics;
+      var _timings_key = timings[key], reporterName = _timings_key.reporter, serverTimingName = _timings_key.serverTiming, loggerName = _timings_key.logger;
       reporterName && reporter.reportTiming(reporterName, cost);
       serverTimingName && serverTiming.addServeTiming(serverTimingName, cost);
-      metricsName && metrics.emitTimer(metricsName, cost);
       loggerName && logger.debug(loggerName, cost);
     }
   };

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

@@ -76,6 +76,9 @@ const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
           const routerContext = await query(remixRequest, {
             requestContext
           });
+          if ("errors" in routerContext && routerContext.errors && Object.keys(routerContext.errors).length > 0) {
+            throw new Error(Object.values(routerContext.errors)[0]);
+          }
           const cost = end();
           reporter.reportTiming(LOADER_REPORTER_NAME, cost);
           serverTiming.addServeTiming(LOADER_REPORTER_NAME, cost);

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

@@ -120,24 +120,20 @@ const ssrPlugin = () => ({
       },
       modifyEntryRuntimePlugins({ entrypoint, plugins, bundlerConfigs }) {
         if (ssrConfigMap.get(entrypoint.entryName)) {
-          var _bundlerConfigs_find_output, _bundlerConfigs_find, _config_server, _config_server1;
+          var _bundlerConfigs_find_output, _bundlerConfigs_find;
           const chunkLoadingGlobal = bundlerConfigs === null || bundlerConfigs === void 0 ? void 0 : (_bundlerConfigs_find = bundlerConfigs.find((config2) => 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;
           const config = api.useResolvedConfigContext();
           const { enableInlineScripts, enableInlineStyles } = config.output;
           const { crossorigin, scriptLoading } = config.html;
-          const disablePrerender = typeof ((_config_server = config.server) === null || _config_server === void 0 ? void 0 : _config_server.ssr) === "object" ? Boolean(config.server.ssr.disablePrerender) : false;
-          const unsafeHeaders = typeof ((_config_server1 = config.server) === null || _config_server1 === void 0 ? void 0 : _config_server1.ssr) === "object" ? config.server.ssr.unsafeHeaders : void 0;
           plugins.push({
             name: PLUGIN_IDENTIFIER,
             options: JSON.stringify({
+              scriptLoading,
               ...ssrConfigMap.get(entrypoint.entryName) || {},
               crossorigin,
-              scriptLoading,
               chunkLoadingGlobal,
-              disablePrerender,
               enableInlineScripts: typeof enableInlineScripts === "function" ? void 0 : enableInlineScripts,
-              enableInlineStyles: typeof enableInlineStyles === "function" ? void 0 : enableInlineStyles,
-              unsafeHeaders
+              enableInlineStyles: typeof enableInlineStyles === "function" ? void 0 : enableInlineStyles
             })
           });
         }

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

@@ -54,8 +54,7 @@ const prefetch = async (App, context, config, tracker) => run(context.ssrContext
   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);
+      ssrContext.logger.error("App Load use-loader", data._error);
       delete data._error;
     }
   });

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

@@ -8,7 +8,9 @@ var ShellChunkStatus;
   ShellChunkStatus2[ShellChunkStatus2["FINIESH"] = 1] = "FINIESH";
 })(ShellChunkStatus || (ShellChunkStatus = {}));
 function renderToPipe(rootElement, context, pluginConfig, options) {
+  var _context_ssrContext;
   let shellChunkStatus = 0;
+  const onReady = ((_context_ssrContext = context.ssrContext) === null || _context_ssrContext === void 0 ? void 0 : _context_ssrContext.isSpider) ? "onAllReady" : "onShellReady";
   const { ssrContext } = context;
   const chunkVec = [];
   const forUserPipe = (stream) => {
@@ -21,7 +23,7 @@ function renderToPipe(rootElement, context, pluginConfig, options) {
       const { pipe } = renderToPipeableStream(rootElement, {
         ...options,
         nonce: ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.nonce,
-        onShellReady() {
+        [onReady]() {
           getTemplates(context, RenderLevel.SERVER_RENDER, pluginConfig).then(({ shellAfter, shellBefore }) => {
             var _options_onShellReady;
             options === null || options === void 0 ? void 0 : (_options_onShellReady = options.onShellReady) === null || _options_onShellReady === void 0 ? void 0 : _options_onShellReady.call(options);

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

@@ -19,6 +19,7 @@ function renderToPipe(rootElement, context, pluginConfig, options) {
     }
     const { shellAfter, shellBefore } = await getTemplates(context, RenderLevel.SERVER_RENDER, pluginConfig);
     try {
+      var _context_ssrContext;
       const readableOriginal = await renderToReadableStream(rootElement, {
         ...options,
         nonce: ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.nonce,
@@ -27,6 +28,9 @@ function renderToPipe(rootElement, context, pluginConfig, options) {
           options === null || options === void 0 ? void 0 : (_options_onError = options.onError) === null || _options_onError === void 0 ? void 0 : _options_onError.call(options, error);
         }
       });
+      if ((_context_ssrContext = context.ssrContext) === null || _context_ssrContext === void 0 ? void 0 : _context_ssrContext.isSpider) {
+        await readableOriginal.allReady;
+      }
       const reader = readableOriginal.getReader();
       const injectableStream = new ReadableStream({
         start(controller) {

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

@@ -128,7 +128,6 @@ class Entry {
   constructor(options) {
     _define_property(this, "entryName", void 0);
     _define_property(this, "result", void 0);
-    _define_property(this, "metrics", void 0);
     _define_property(this, "tracker", void 0);
     _define_property(this, "template", void 0);
     _define_property(this, "App", void 0);
@@ -144,7 +143,6 @@ class Entry {
     this.pluginConfig = config;
     this.routeManifest = ctx.routeManifest;
     this.tracker = ctx.tracker;
-    this.metrics = ctx.metrics;
     this.htmlModifiers = ctx.htmlModifiers;
     this.nonce = nonce;
     this.result = {

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

@@ -8,7 +8,6 @@ const render = ({ App, context, config }) => {
       App,
       config
     });
-    entry.metrics.emitCounter("app.visit.count", 1);
     const html = await entry.renderToHtml(context);
     return html;
   });

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

@@ -72,7 +72,8 @@ class LoadableCollector {
     const { scriptLoading = "defer", enableInlineScripts } = config;
     const scriptLoadingAtr = {
       defer: scriptLoading === "defer" ? true : void 0,
-      type: scriptLoading === "module" ? "module" : void 0
+      type: scriptLoading === "module" ? "module" : void 0,
+      async: scriptLoading === "async" ? true : void 0
     };
     const attributes = attributesToString(this.generateAttributes({
       nonce,

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

@@ -16,69 +16,57 @@ var SSRErrors;
 const errors = {
   [0]: {
     reporter: "App Prerender",
-    logger: "App Prerender",
-    metrics: "app.prerender.error"
+    logger: "App Prerender"
   },
   [1]: {
     reporter: "App run useLoader",
-    logger: "App run useLoader",
-    metrics: "app.useloader.error"
+    logger: "App run useLoader"
   },
   [2]: {
     reporter: "App Render To HTML",
-    logger: "App Render To HTML",
-    metrics: "app.render.html.error"
+    logger: "App Render To HTML"
   },
   [3]: {
     reporter: "App Render To Streaming",
-    logger: "An error occurs during streaming SSR",
-    metrics: "app.render.streaming.error"
+    logger: "An error occurs during streaming SSR"
   },
-  [4]: {
-    metrics: "app.render.streaming.shell.error"
-  }
+  [4]: {}
 };
 const timings = {
   [0]: {
     reporter: "ssr-prerender",
     serverTiming: "ssr-prerender",
-    metrics: "app.prerender.cost",
     logger: "App Prerender cost = %d ms"
   },
   [1]: {
     reporter: "ssr-render-html",
     serverTiming: "ssr-render-html",
-    metrics: "app.render.html.cost",
     logger: "App Render To HTML cost = %d ms"
   },
   [2]: {
     reporter: "ssr-render-shell",
-    metrics: "app.render.shell.cost",
     logger: "App Render To Shell cost = %d ms"
   },
   [3]: {
     reporter: "use-loader",
     serverTiming: "use-loader",
-    metrics: "app.useloader.cost",
     logger: "App run useLoader cost = %d ms"
   }
 };
-function createSSRTracker({ reporter, serverTiming, metrics, logger }) {
+function createSSRTracker({ reporter, serverTiming, logger }) {
   const tracker = {
     get sessionId() {
       return reporter.sessionId;
     },
     trackError(key, e) {
-      const { reporter: reporterContent, metrics: metricsContent, logger: loggerContent } = errors[key];
+      const { reporter: reporterContent, logger: loggerContent } = errors[key];
       reporterContent && reporter.reportError(`SSR Error - ${reporterContent}`, e);
-      metricsContent && metrics.emitCounter(metricsContent, 1);
       loggerContent && logger.error(loggerContent, e);
     },
     trackTiming(key, cost) {
-      const { reporter: reporterName, serverTiming: serverTimingName, logger: loggerName, metrics: metricsName } = timings[key];
+      const { reporter: reporterName, serverTiming: serverTimingName, logger: loggerName } = timings[key];
       reporterName && reporter.reportTiming(reporterName, cost);
       serverTimingName && serverTiming.addServeTiming(serverTimingName, cost);
-      metricsName && metrics.emitTimer(metricsName, cost);
       loggerName && logger.debug(loggerName, cost);
     }
   };

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

@@ -8,7 +8,6 @@ type EntryOptions = {
 export default class Entry {
     entryName: string;
     result: RenderResult;
-    metrics: SSRServerContext['metrics'];
     tracker: SSRTracker;
     private readonly template;
     private readonly App;

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

@@ -13,7 +13,7 @@ export declare enum SSRErrors {
     RENDER_STREAM = 3,
     RENDER_SHELL = 4
 }
-export declare function createSSRTracker({ reporter, serverTiming, metrics, logger, }: BaseSSRServerContext): {
+export declare function createSSRTracker({ reporter, serverTiming, logger, }: 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

@@ -30,7 +30,7 @@ export type ModernSSRReactComponent = React.ComponentType<any>;
 export { RuntimeContext };
 export type SSRPluginConfig = {
     crossorigin?: boolean | 'anonymous' | 'use-credentials';
-    scriptLoading?: 'defer' | 'blocking' | 'module';
+    scriptLoading?: 'defer' | 'blocking' | 'module' | 'async';
     enableInlineStyles?: boolean | RegExp;
     enableInlineScripts?: boolean | RegExp;
     disablePrerender?: boolean;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.44.0",
+  "version": "2.45.1-alpha.0",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -171,10 +171,10 @@
     "react-side-effect": "^2.1.1",
     "styled-components": "^5.3.1",
     "@swc/helpers": "0.5.3",
-    "@modern-js/types": "2.44.0",
-    "@modern-js/utils": "2.44.0",
-    "@modern-js/runtime-utils": "2.44.0",
-    "@modern-js/plugin": "2.44.0"
+    "@modern-js/types": "2.45.0",
+    "@modern-js/plugin": "2.45.0",
+    "@modern-js/utils": "2.45.0",
+    "@modern-js/runtime-utils": "2.45.0"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -195,11 +195,11 @@
     "ts-jest": "^29.1.0",
     "typescript": "^5",
     "webpack": "^5.89.0",
-    "@modern-js/app-tools": "2.44.0",
-    "@modern-js/core": "2.44.0",
-    "@modern-js/server-core": "2.44.0",
-    "@scripts/build": "2.44.0",
-    "@scripts/jest-config": "2.44.0"
+    "@scripts/build": "2.45.0",
+    "@modern-js/core": "2.45.0",
+    "@modern-js/server-core": "2.45.0",
+    "@modern-js/app-tools": "2.45.0",
+    "@scripts/jest-config": "2.45.0"
   },
   "sideEffects": false,
   "publishConfig": {