@modern-js/runtime 2.39.2 → 2.41.0

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

@@ -26,7 +26,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();
@@ -34,19 +34,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;
@@ -55,8 +55,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/esm-node/router/cli/index.js

@@ -29,19 +29,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/esm-node/ssr/prefetch.js

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

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

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

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

@@ -8,7 +8,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) => {
@@ -28,12 +28,12 @@ function renderToPipe(rootElement, context, options) {
           const injectableTransform = new Transform({
             transform(chunk, _encoding, callback) {
               try {
-                if (shellChunkStatus !== ShellChunkStatus.FINIESH) {
+                if (shellChunkStatus !== 1) {
                   chunkVec.push(chunk.toString());
                   let concatedChunk = chunkVec.join("");
                   if (concatedChunk.endsWith(ESCAPED_SHELL_STREAM_END_MARK)) {
                     concatedChunk = concatedChunk.replace(ESCAPED_SHELL_STREAM_END_MARK, "");
-                    shellChunkStatus = ShellChunkStatus.FINIESH;
+                    shellChunkStatus = 1;
                     this.push(`${shellBefore}${concatedChunk}${shellAfter}`);
                   }
                 } else {

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

@@ -8,7 +8,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 () => {
@@ -36,13 +36,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(ESCAPED_SHELL_STREAM_END_MARK)) {
                 concatedChunk = concatedChunk.replace(ESCAPED_SHELL_STREAM_END_MARK, "");
-                shellChunkStatus = ShellChunkStatus.FINIESH;
+                shellChunkStatus = 1;
                 controller.enqueue(encodeForWebStream(`${shellBefore}${concatedChunk}${shellAfter}`));
               }
             } else {

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

@@ -36,7 +36,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;
@@ -72,15 +73,11 @@ class Entry {
   }
   async prefetch(context) {
     let prefetchData;
-    const end = time();
     try {
-      prefetchData = await prefetch(this.App, context, this.pluginConfig);
+      prefetchData = await prefetch(this.App, context, this.pluginConfig, this.tracker);
       this.result.renderLevel = RenderLevel.SERVER_PREFETCH;
-      const prefetchCost = end();
-      this.tracker.trackTiming(SSRTimings.SSR_PREFETCH, prefetchCost);
     } catch (e) {
       this.result.renderLevel = RenderLevel.CLIENT_RENDER;
-      this.tracker.trackError(SSRErrors.PREFETCH, e);
     }
     return prefetchData || {};
   }
@@ -104,7 +101,7 @@ class Entry {
         routeManifest: this.routeManifest
       })).finish();
       const cost = end();
-      this.tracker.trackTiming(SSRTimings.SSR_RENDER_HTML, cost);
+      this.tracker.trackTiming(SSRTimings.RENDER_HTML, cost);
       this.result.renderLevel = RenderLevel.SERVER_RENDER;
     } catch (e) {
       this.tracker.trackError(SSRErrors.RENDER_HTML, e);
@@ -157,7 +154,7 @@ class Entry {
       }
     };
   }
-}
+};
 export {
   Entry as default
 };

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

@@ -1,7 +1,5 @@
 import { run } from "@modern-js/runtime-utils/node";
-import { time } from "@modern-js/runtime-utils/time";
 import { PreRender } from "../../react/prerender";
-import { SSRTimings } from "../tracker";
 import SSREntry from "./entry";
 const render = ({ App, context, config }) => {
   const ssrContext = context.ssrContext;
@@ -12,10 +10,7 @@ const render = ({ App, context, config }) => {
       config
     });
     entry.metrics.emitCounter("app.visit.count", 1);
-    const end = time();
     const html = await entry.renderToHtml(context);
-    const cost = end();
-    entry.tracker.trackTiming(SSRTimings.SSR_RENDER_TOTAL, cost);
     const cacheConfig = PreRender.config();
     if (cacheConfig) {
       context.ssrContext.cacheConfig = cacheConfig;

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

@@ -19,6 +19,12 @@ const checkIsInline = (chunk, enableInline) => {
     return false;
   }
 };
+const readAsset = async (chunk) => {
+  const fs = await import("fs/promises");
+  const path = await import("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";
@@ -81,14 +87,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 import("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("");
@@ -101,13 +106,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 import("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/esm-node/ssr/serverRender/tracker.js

@@ -1,58 +1,63 @@
 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/esm-node/state/cli/index.js

@@ -55,19 +55,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/types/ssr/prefetch.d.ts

@@ -1,12 +1,14 @@
 import { RuntimeContext } from '../core';
+import { LoaderResult } from '../core/loader/loaderManager';
 import { SSRPluginConfig } from './serverRender/types';
-declare const prefetch: (App: React.ComponentType<any>, context: RuntimeContext, config: SSRPluginConfig) => Promise<{
+import { SSRTracker } from './serverRender/tracker';
+declare const prefetch: (App: React.ComponentType<any>, context: RuntimeContext, config: SSRPluginConfig, tracker: SSRTracker) => Promise<{
   initialData: Record<string, unknown> | undefined;
   i18nData: any;
   loadersData?: undefined;
   storeState?: undefined;
 } | {
-  loadersData: Record<string, import("../core/loader/loaderManager").LoaderResult>;
+  loadersData: Record<string, LoaderResult>;
   initialData: Record<string, unknown> | undefined;
   i18nData: any;
   storeState: any;

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

@@ -1,16 +1,17 @@
 import type { BaseSSRServerContext } from '@modern-js/types';
 export type SSRTracker = ReturnType<typeof createSSRTracker>;
 export declare enum SSRTimings {
-  SSR_RENDER_TOTAL = 0,
-  SSR_PREFETCH = 1,
-  SSR_RENDER_HTML = 2,
-  SSR_RENDER_SHELL = 3,
+  PRERENDER = 0,
+  RENDER_HTML = 1,
+  RENDER_SHELL = 2,
+  USE_LOADER = 3,
 }
 export declare enum SSRErrors {
-  PREFETCH = 0,
-  RENDER_HTML = 1,
-  RENDER_STREAM = 2,
-  RENDER_SHELL = 3,
+  PRERENDER = 0,
+  USE_LOADER = 1,
+  RENDER_HTML = 2,
+  RENDER_STREAM = 3,
+  RENDER_SHELL = 4,
 }
 export declare function createSSRTracker({
   reporter,

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.39.2",
+  "version": "2.41.0",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -170,11 +170,11 @@
     "react-is": "^18",
     "react-side-effect": "^2.1.1",
     "styled-components": "^5.3.1",
-    "@swc/helpers": "0.5.1",
-    "@modern-js/plugin": "2.39.2",
-    "@modern-js/utils": "2.39.2",
-    "@modern-js/runtime-utils": "2.39.2",
-    "@modern-js/types": "2.39.2"
+    "@swc/helpers": "0.5.3",
+    "@modern-js/plugin": "2.41.0",
+    "@modern-js/types": "2.41.0",
+    "@modern-js/utils": "2.41.0",
+    "@modern-js/runtime-utils": "2.41.0"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -195,11 +195,11 @@
     "ts-jest": "^29.1.0",
     "typescript": "^5",
     "webpack": "^5.88.1",
-    "@modern-js/app-tools": "2.39.2",
-    "@modern-js/core": "2.39.2",
-    "@scripts/build": "2.39.2",
-    "@modern-js/server-core": "2.39.2",
-    "@scripts/jest-config": "2.39.2"
+    "@modern-js/core": "2.41.0",
+    "@scripts/build": "2.41.0",
+    "@modern-js/server-core": "2.41.0",
+    "@modern-js/app-tools": "2.41.0",
+    "@scripts/jest-config": "2.41.0"
   },
   "sideEffects": false,
   "publishConfig": {