@modern-js/runtime 2.39.2 → 2.41.0

package/dist/cjs/cli/index.js

@@ -85,29 +85,6 @@ const runtimePlugin = () => ({
           }
         };
       },
-      validateSchema() {
-        return [
-          {
-            target: "runtime",
-            schema: {
-              type: "object",
-              additionalProperties: false
-            }
-          },
-          {
-            target: "runtimeByEntries",
-            schema: {
-              type: "object",
-              patternProperties: {
-                [import_utils.ENTRY_NAME_PATTERN]: {
-                  type: "object"
-                }
-              },
-              additionalProperties: false
-            }
-          }
-        ];
-      },
       async beforeRestart() {
         (0, import_utils.cleanRequireCache)([
           require.resolve("../state/cli"),

package/dist/cjs/core/loader/loaderManager.js

@@ -60,7 +60,7 @@ const createLoader = (id, initialData = {
   error: void 0
 }, loaderFn, skip = false) => {
   let promise;
-  let status = LoaderStatus.idle;
+  let status = 0;
   let { data, error } = initialData;
   let hasLoaded = false;
   const handlers = /* @__PURE__ */ new Set();
@@ -68,19 +68,19 @@ const createLoader = (id, initialData = {
     if (skip) {
       return promise;
     }
-    if (status === LoaderStatus.loading) {
+    if (status === 1) {
       return promise;
     }
-    status = LoaderStatus.loading;
+    status = 1;
     notify();
     promise = loaderFn().then((value) => {
       data = value;
       error = null;
-      status = LoaderStatus.fulfilled;
+      status = 2;
     }).catch((e) => {
       error = e;
       data = null;
-      status = LoaderStatus.rejected;
+      status = 3;
     }).finally(() => {
       promise = null;
       hasLoaded = true;
@@ -89,8 +89,8 @@ const createLoader = (id, initialData = {
     return promise;
   };
   const getResult = () => ({
-    loading: !hasLoaded && status === LoaderStatus.loading,
-    reloading: hasLoaded && status === LoaderStatus.loading,
+    loading: !hasLoaded && status === 1,
+    reloading: hasLoaded && status === 1,
     data,
     error: error instanceof Error ? `${error.message}` : error,
     // redundant fields for ssr log

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

@@ -53,19 +53,6 @@ const routerPlugin = () => ({
           }
         };
       },
-      validateSchema() {
-        return [
-          {
-            target: "runtime.router",
-            schema: {
-              type: [
-                "boolean",
-                "object"
-              ]
-            }
-          }
-        ];
-      },
       modifyEntryImports({ entrypoint, imports }) {
         const { entryName, isMainEntry, fileSystemRoutes } = entrypoint;
         const userConfig = api.useResolvedConfigContext();

package/dist/cjs/ssr/prefetch.js

@@ -25,25 +25,36 @@ var import_jsx_runtime = require("react/jsx-runtime");
 var import_server = require("react-dom/server");
 var import_node = require("@modern-js/runtime-utils/node");
 var import_server2 = require("@loadable/server");
-const prefetch = async (App, context, config) => (0, import_node.run)(context.ssrContext.request.headers, async () => {
+var import_time = require("@modern-js/runtime-utils/time");
+var import_tracker = require("./serverRender/tracker");
+const prefetch = async (App, context, config, tracker) => (0, import_node.run)(context.ssrContext.request.headers, async () => {
   var _context_store;
   const { ssrContext } = context;
   const { loadableStats } = ssrContext;
   if (!config.disablePrerender) {
-    if (loadableStats) {
-      const extractor = new import_server2.ChunkExtractor({
-        stats: loadableStats,
-        entrypoints: [
-          ssrContext.entryName
-        ].filter(Boolean)
-      });
-      (0, import_server.renderToStaticMarkup)(extractor.collectChunks(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
-        context
-      })));
-    } else {
-      (0, import_server.renderToStaticMarkup)(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
-        context
-      }));
+    try {
+      const end = (0, import_time.time)();
+      if (loadableStats) {
+        const extractor = new import_server2.ChunkExtractor({
+          stats: loadableStats,
+          entrypoints: [
+            ssrContext.entryName
+          ].filter(Boolean)
+        });
+        (0, import_server.renderToStaticMarkup)(extractor.collectChunks(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
+          context
+        })));
+      } else {
+        (0, import_server.renderToStaticMarkup)(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
+          context
+        }));
+      }
+      const cost = end();
+      tracker.trackTiming(import_tracker.SSRTimings.PRERENDER, cost);
+    } catch (e) {
+      const error = e;
+      tracker.trackError(import_tracker.SSRErrors.PRERENDER, error);
+      throw e;
     }
   }
   if (!context.loaderManager.hasPendingLoaders()) {
@@ -52,7 +63,17 @@ const prefetch = async (App, context, config) => (0, import_node.run)(context.ss
       i18nData: context.__i18nData__
     };
   }
-  const loadersData = await context.loaderManager.awaitPendingLoaders();
+  let loadersData = {};
+  try {
+    const end = (0, import_time.time)();
+    loadersData = await context.loaderManager.awaitPendingLoaders();
+    const cost = end();
+    tracker.trackTiming(import_tracker.SSRTimings.USE_LOADER, cost);
+  } catch (e) {
+    const error = e;
+    tracker.trackError(import_tracker.SSRErrors.USE_LOADER, error);
+    throw e;
+  }
   Object.keys(loadersData).forEach((id) => {
     const data = loadersData[id];
     if (data._error) {

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

@@ -57,11 +57,11 @@ const render = ({ App, context }) => {
           ssrContext.cacheConfig = cacheConfig;
         }
         const cost = end();
-        tracker.trackTiming(import_tracker.SSRTimings.SSR_RENDER_SHELL, cost);
+        tracker.trackTiming(import_tracker.SSRTimings.RENDER_SHELL, cost);
       },
       onAllReady() {
         const cost = end();
-        tracker.trackTiming(import_tracker.SSRTimings.SSR_RENDER_TOTAL, cost);
+        tracker.trackTiming(import_tracker.SSRTimings.RENDER_HTML, cost);
       },
       onShellError(e) {
         tracker.trackError(import_tracker.SSRErrors.RENDER_SHELL, e);

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

@@ -31,7 +31,7 @@ var ShellChunkStatus;
   ShellChunkStatus2[ShellChunkStatus2["FINIESH"] = 1] = "FINIESH";
 })(ShellChunkStatus || (ShellChunkStatus = {}));
 function renderToPipe(rootElement, context, options) {
-  let shellChunkStatus = ShellChunkStatus.START;
+  let shellChunkStatus = 0;
   const { ssrContext } = context;
   const chunkVec = [];
   const forUserPipe = (stream) => {
@@ -51,12 +51,12 @@ function renderToPipe(rootElement, context, options) {
           const injectableTransform = new import_stream.Transform({
             transform(chunk, _encoding, callback) {
               try {
-                if (shellChunkStatus !== ShellChunkStatus.FINIESH) {
+                if (shellChunkStatus !== 1) {
                   chunkVec.push(chunk.toString());
                   let concatedChunk = chunkVec.join("");
                   if (concatedChunk.endsWith(import_common.ESCAPED_SHELL_STREAM_END_MARK)) {
                     concatedChunk = concatedChunk.replace(import_common.ESCAPED_SHELL_STREAM_END_MARK, "");
-                    shellChunkStatus = ShellChunkStatus.FINIESH;
+                    shellChunkStatus = 1;
                     this.push(`${shellBefore}${concatedChunk}${shellAfter}`);
                   }
                 } else {

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

@@ -31,7 +31,7 @@ var ShellChunkStatus;
   ShellChunkStatus2[ShellChunkStatus2["FINIESH"] = 1] = "FINIESH";
 })(ShellChunkStatus || (ShellChunkStatus = {}));
 function renderToPipe(rootElement, context, options) {
-  let shellChunkStatus = ShellChunkStatus.START;
+  let shellChunkStatus = 0;
   const chunkVec = [];
   const { ssrContext } = context;
   const forUserPipe = async () => {
@@ -59,13 +59,13 @@ function renderToPipe(rootElement, context, options) {
               controller.close();
               return;
             }
-            if (shellChunkStatus !== ShellChunkStatus.FINIESH) {
+            if (shellChunkStatus !== 1) {
               const chunk = new TextDecoder().decode(value);
               chunkVec.push(chunk);
               let concatedChunk = chunkVec.join("");
               if (concatedChunk.endsWith(import_common.ESCAPED_SHELL_STREAM_END_MARK)) {
                 concatedChunk = concatedChunk.replace(import_common.ESCAPED_SHELL_STREAM_END_MARK, "");
-                shellChunkStatus = ShellChunkStatus.FINIESH;
+                shellChunkStatus = 1;
                 controller.enqueue(encodeForWebStream(`${shellBefore}${concatedChunk}${shellAfter}`));
               }
             } else {

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

@@ -69,7 +69,8 @@ const buildTemplateData = (context, data, renderLevel, tracker) => {
     renderLevel
   };
 };
-class Entry {
+var Entry;
+Entry = class Entry2 {
   async renderToHtml(context) {
     var _ssrContext_redirection, _ssrContext_redirection1, _ssrContext_redirection2;
     const ssrContext = context.ssrContext;
@@ -105,15 +106,11 @@ class Entry {
   }
   async prefetch(context) {
     let prefetchData;
-    const end = (0, import_time.time)();
     try {
-      prefetchData = await (0, import_prefetch.default)(this.App, context, this.pluginConfig);
+      prefetchData = await (0, import_prefetch.default)(this.App, context, this.pluginConfig, this.tracker);
       this.result.renderLevel = import_types.RenderLevel.SERVER_PREFETCH;
-      const prefetchCost = end();
-      this.tracker.trackTiming(import_tracker.SSRTimings.SSR_PREFETCH, prefetchCost);
     } catch (e) {
       this.result.renderLevel = import_types.RenderLevel.CLIENT_RENDER;
-      this.tracker.trackError(import_tracker.SSRErrors.PREFETCH, e);
     }
     return prefetchData || {};
   }
@@ -137,7 +134,7 @@ class Entry {
         routeManifest: this.routeManifest
       })).finish();
       const cost = end();
-      this.tracker.trackTiming(import_tracker.SSRTimings.SSR_RENDER_HTML, cost);
+      this.tracker.trackTiming(import_tracker.SSRTimings.RENDER_HTML, cost);
       this.result.renderLevel = import_types.RenderLevel.SERVER_RENDER;
     } catch (e) {
       this.tracker.trackError(import_tracker.SSRErrors.RENDER_HTML, e);
@@ -190,4 +187,4 @@ class Entry {
       }
     };
   }
-}
+};

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

@@ -32,9 +32,7 @@ __export(renderToString_exports, {
 });
 module.exports = __toCommonJS(renderToString_exports);
 var import_node = require("@modern-js/runtime-utils/node");
-var import_time = require("@modern-js/runtime-utils/time");
 var import_prerender = require("../../react/prerender");
-var import_tracker = require("../tracker");
 var import_entry = __toESM(require("./entry"));
 const render = ({ App, context, config }) => {
   const ssrContext = context.ssrContext;
@@ -45,10 +43,7 @@ const render = ({ App, context, config }) => {
       config
     });
     entry.metrics.emitCounter("app.visit.count", 1);
-    const end = (0, import_time.time)();
     const html = await entry.renderToHtml(context);
-    const cost = end();
-    entry.tracker.trackTiming(import_tracker.SSRTimings.SSR_RENDER_TOTAL, cost);
     const cacheConfig = import_prerender.PreRender.config();
     if (cacheConfig) {
       context.ssrContext.cacheConfig = cacheConfig;

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

@@ -52,6 +52,12 @@ const checkIsInline = (chunk, enableInline) => {
     return false;
   }
 };
+const readAsset = async (chunk) => {
+  const fs = await Promise.resolve().then(() => __toESM(require("fs/promises")));
+  const path = await Promise.resolve().then(() => __toESM(require("path")));
+  const filepath = path.resolve(__dirname, chunk.filename);
+  return fs.readFile(filepath, "utf-8");
+};
 const checkIsNode = () => {
   var _process_release;
   return typeof process !== "undefined" && ((_process_release = process.release) === null || _process_release === void 0 ? void 0 : _process_release.name) === "node";
@@ -114,14 +120,13 @@ class LoadableCollector {
       const jsChunkReg = new RegExp(`<script .*src="${chunk.url}".*>`);
       return !jsChunkReg.test(template) && !((_this_existsAssets = this.existsAssets) === null || _this_existsAssets === void 0 ? void 0 : _this_existsAssets.includes(chunk.path));
     }).map(async (chunk) => {
+      const script = `<script${attributes} src="${chunk.url}"></script>`;
       if (checkIsInline(chunk, enableInlineScripts) && checkIsNode()) {
-        const fs = await Promise.resolve().then(() => __toESM(require("node:fs/promises")));
-        const filepath = chunk.path;
-        return fs.readFile(filepath, "utf-8").then((content) => `<script>${content}</script>`).catch((_) => {
-          return "";
+        return readAsset(chunk).then((content) => `<script>${content}</script>`).catch((_) => {
+          return script;
         });
       } else {
-        return `<script${attributes} src="${chunk.url}"></script>`;
+        return script;
       }
     }));
     chunksMap.js += scripts.filter((script) => Boolean(script)).join("");
@@ -134,13 +139,13 @@ class LoadableCollector {
       const cssChunkReg = new RegExp(`<link .*href="${chunk.url}".*>`);
       return !cssChunkReg.test(template) && !((_this_existsAssets = this.existsAssets) === null || _this_existsAssets === void 0 ? void 0 : _this_existsAssets.includes(chunk.path));
     }).map(async (chunk) => {
+      const link = `<link${atrributes} href="${chunk.url}" rel="stylesheet" />`;
       if (checkIsInline(chunk, enableInlineStyles) && checkIsNode()) {
-        const fs = await Promise.resolve().then(() => __toESM(require("node:fs/promises")));
-        return fs.readFile(chunk.path).then((content) => `<style>${content}</style>`).catch((_) => {
-          return "";
+        return readAsset(chunk).then((content) => `<style>${content}</style>`).catch((_) => {
+          return link;
         });
       } else {
-        return `<link${atrributes} href="${chunk.url}" rel="stylesheet" />`;
+        return link;
       }
     }));
     chunksMap.css += css.filter((css2) => Boolean(css2)).join("");

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

@@ -25,59 +25,64 @@ __export(tracker_exports, {
 module.exports = __toCommonJS(tracker_exports);
 var SSRTimings;
 (function(SSRTimings2) {
-  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";
+  SSRTimings2[SSRTimings2["PRERENDER"] = 0] = "PRERENDER";
+  SSRTimings2[SSRTimings2["RENDER_HTML"] = 1] = "RENDER_HTML";
+  SSRTimings2[SSRTimings2["RENDER_SHELL"] = 2] = "RENDER_SHELL";
+  SSRTimings2[SSRTimings2["USE_LOADER"] = 3] = "USE_LOADER";
 })(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";
+  SSRErrors2[SSRErrors2["PRERENDER"] = 0] = "PRERENDER";
+  SSRErrors2[SSRErrors2["USE_LOADER"] = 1] = "USE_LOADER";
+  SSRErrors2[SSRErrors2["RENDER_HTML"] = 2] = "RENDER_HTML";
+  SSRErrors2[SSRErrors2["RENDER_STREAM"] = 3] = "RENDER_STREAM";
+  SSRErrors2[SSRErrors2["RENDER_SHELL"] = 4] = "RENDER_SHELL";
 })(SSRErrors || (SSRErrors = {}));
 const errors = {
-  [SSRErrors.PREFETCH]: {
-    reporter: "SSR Error - App Prefetch Render",
-    logger: "App Prefetch Render",
-    metrics: "app.prefetch.render.error"
+  [0]: {
+    reporter: "SSR Error - App Prerender",
+    logger: "App Prerender",
+    metrics: "app.prerender.error"
   },
-  [SSRErrors.RENDER_HTML]: {
+  [1]: {
+    reporter: "SSR Error - App run useLoader",
+    logger: "App run useLoader",
+    metrics: "app.useloader.error"
+  },
+  [2]: {
     reporter: "SSR Error - App Render To HTML",
     logger: "App Render To HTML",
     metrics: "app.render.html.error"
   },
-  [SSRErrors.RENDER_STREAM]: {
+  [3]: {
     reporter: "SSR Error - App Render To Streaming",
     logger: "An error occurs during streaming SSR",
     metrics: "app.render.streaming.error"
   },
-  [SSRErrors.RENDER_SHELL]: {
+  [4]: {
     metrics: "app.render.streaming.shell.error"
   }
 };
 const timings = {
-  [SSRTimings.SSR_PREFETCH]: {
-    reporter: "ssr-prefetch",
-    serverTiming: "ssr-prefetch",
-    metrics: "app.prefeth.cost",
-    logger: "App Prefetch cost = %d ms"
+  [0]: {
+    reporter: "ssr-prerender",
+    serverTiming: "ssr-prerender",
+    metrics: "app.prerender.cost",
+    logger: "App Prerender cost = %d ms"
   },
-  [SSRTimings.SSR_RENDER_HTML]: {
+  [1]: {
     reporter: "ssr-render-html",
     serverTiming: "ssr-render-html",
     metrics: "app.render.html.cost",
     logger: "App Render To HTML cost = %d ms"
   },
-  [SSRTimings.SSR_RENDER_TOTAL]: {
-    reporter: "ssr-render-total",
-    serverTiming: "ssr-render-total",
-    metrics: "app.render.cost",
-    logger: "App Render Total cost = %d ms"
-  },
-  [SSRTimings.SSR_RENDER_SHELL]: {
+  [2]: {
     reporter: "ssr-render-shell"
+  },
+  [3]: {
+    reporter: "use-loader",
+    serverTiming: "use-loader",
+    logger: "App run useLoader cost = %d ms"
   }
 };
 function createSSRTracker({ reporter, serverTiming, metrics, logger }) {

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

@@ -79,19 +79,6 @@ const statePlugin = () => ({
           plugins
         };
       },
-      validateSchema() {
-        return [
-          {
-            target: "runtime.state",
-            schema: {
-              type: [
-                "boolean",
-                "object"
-              ]
-            }
-          }
-        ];
-      },
       addRuntimeExports() {
         pluginsExportsUtils.addExport(`export { default as state } from '@modern-js/runtime/model'`);
       }

package/dist/esm/cli/index.js

@@ -1,8 +1,7 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
-import { isReact18, cleanRequireCache, ENTRY_NAME_PATTERN } from "@modern-js/utils";
+import { isReact18, cleanRequireCache } from "@modern-js/utils";
 import { statePlugin } from "../state/cli";
 import { ssrPlugin } from "../ssr/cli";
 import { routerPlugin } from "../router/cli";
@@ -55,27 +54,6 @@ var runtimePlugin = function() {
             }
           };
         },
-        validateSchema: function validateSchema() {
-          return [
-            {
-              target: "runtime",
-              schema: {
-                type: "object",
-                additionalProperties: false
-              }
-            },
-            {
-              target: "runtimeByEntries",
-              schema: {
-                type: "object",
-                patternProperties: _define_property({}, ENTRY_NAME_PATTERN, {
-                  type: "object"
-                }),
-                additionalProperties: false
-              }
-            }
-          ];
-        },
         beforeRestart: function beforeRestart() {
           return _async_to_generator(function() {
             return _ts_generator(this, function(_state) {

package/dist/esm/core/loader/loaderManager.js

@@ -32,7 +32,7 @@ var createLoader = function(id) {
     error: void 0
   }, loaderFn = arguments.length > 2 ? arguments[2] : void 0, skip = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : false;
   var promise;
-  var status = LoaderStatus.idle;
+  var status = 0;
   var data = initialData.data, error = initialData.error;
   var hasLoaded = false;
   var handlers = /* @__PURE__ */ new Set();
@@ -45,22 +45,22 @@ var createLoader = function(id) {
             promise
           ];
         }
-        if (status === LoaderStatus.loading) {
+        if (status === 1) {
           return [
             2,
             promise
           ];
         }
-        status = LoaderStatus.loading;
+        status = 1;
         notify();
         promise = loaderFn().then(function(value) {
           data = value;
           error = null;
-          status = LoaderStatus.fulfilled;
+          status = 2;
         }).catch(function(e) {
           error = e;
           data = null;
-          status = LoaderStatus.rejected;
+          status = 3;
         }).finally(function() {
           promise = null;
           hasLoaded = true;
@@ -78,8 +78,8 @@ var createLoader = function(id) {
   }();
   var getResult = function() {
     return {
-      loading: !hasLoaded && status === LoaderStatus.loading,
-      reloading: hasLoaded && status === LoaderStatus.loading,
+      loading: !hasLoaded && status === 1,
+      reloading: hasLoaded && status === 1,
       data,
       error: _instanceof(error, Error) ? "".concat(error.message) : error,
       // redundant fields for ssr log

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

@@ -32,19 +32,6 @@ var routerPlugin = function() {
             }
           };
         },
-        validateSchema: function validateSchema() {
-          return [
-            {
-              target: "runtime.router",
-              schema: {
-                type: [
-                  "boolean",
-                  "object"
-                ]
-              }
-            }
-          ];
-        },
         modifyEntryImports: function modifyEntryImports(param) {
           var entrypoint = param.entrypoint, imports = param.imports;
           var entryName = entrypoint.entryName, isMainEntry = entrypoint.isMainEntry, fileSystemRoutes = entrypoint.fileSystemRoutes;

package/dist/esm/ssr/cli/babel-plugin-ssr-loader-id.js

@@ -62,12 +62,12 @@ var require_babel_plugin_ssr_loader_id = __commonJS({
       ])), []);
     }
     module.exports = function() {
-      var genId = function genId2() {
-        return "".concat(hash, "_").concat(index++);
-      };
       var useLoader = null;
       var hash = "";
       var index = 0;
+      function genId() {
+        return "".concat(hash, "_").concat(index++);
+      }
       return {
         name: "babel-plugin-ssr-loader-id",
         pre: function pre() {