@modern-js/runtime 2.29.0 → 2.31.0

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

@@ -4,8 +4,8 @@ const PLUGIN_IDENTIFIER = "ssr";
 const hasStringSSREntry = (userConfig) => {
   var _server, _server1;
   const isStreaming = (ssr) => ssr && typeof ssr === "object" && ssr.mode === "stream";
-  const { server } = userConfig;
-  if (((_server = server) === null || _server === void 0 ? void 0 : _server.ssr) && !isStreaming(server.ssr)) {
+  const { server, output } = userConfig;
+  if ((((_server = server) === null || _server === void 0 ? void 0 : _server.ssr) || output.ssg) && !isStreaming(server.ssr)) {
     return true;
   }
   if (((_server1 = server) === null || _server1 === void 0 ? void 0 : _server1.ssrByEntries) && typeof server.ssrByEntries === "object") {
@@ -17,6 +17,11 @@ const hasStringSSREntry = (userConfig) => {
   }
   return false;
 };
+const checkUseStringSSR = (config) => {
+  var _output;
+  const { output } = config;
+  return Boolean((_output = output) === null || _output === void 0 ? void 0 : _output.ssg) || hasStringSSREntry(config);
+};
 export const ssrPlugin = () => ({
   name: "@modern-js/plugin-ssr",
   required: [
@@ -29,29 +34,30 @@ export const ssrPlugin = () => ({
       config() {
         const appContext = api.useAppContext();
         pluginsExportsUtils = createRuntimeExportsUtils(appContext.internalDirectory, "plugins");
-        const userConfig = api.useConfigContext();
         const { bundlerType = "webpack" } = api.useAppContext();
-        const babelConfig = (() => {
+        const babelHandler = (() => {
           if (bundlerType === "webpack") {
             return (config) => {
               var _config_plugins;
+              const userConfig = api.useResolvedConfigContext();
               (_config_plugins = config.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(path.join(__dirname, "./babel-plugin-ssr-loader-id"));
-              if (isUseSSRBundle(userConfig) && hasStringSSREntry(userConfig)) {
+              if (isUseSSRBundle(userConfig) && checkUseStringSSR(userConfig)) {
                 var _config_plugins1;
                 (_config_plugins1 = config.plugins) === null || _config_plugins1 === void 0 ? void 0 : _config_plugins1.push(require.resolve("@loadable/babel-plugin"));
               }
             };
           } else if (bundlerType === "rspack") {
-            if (isUseSSRBundle(userConfig)) {
-              return (config) => {
+            return (config) => {
+              const userConfig = api.useResolvedConfigContext();
+              if (isUseSSRBundle(userConfig)) {
                 var _config_plugins;
                 (_config_plugins = config.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(path.join(__dirname, "./babel-plugin-ssr-loader-id"));
-                if (hasStringSSREntry(userConfig)) {
+                if (checkUseStringSSR(userConfig)) {
                   var _config_plugins1;
                   (_config_plugins1 = config.plugins) === null || _config_plugins1 === void 0 ? void 0 : _config_plugins1.push(require.resolve("@loadable/babel-plugin"));
                 }
-              };
-            }
+              }
+            };
           }
         })();
         return {
@@ -67,8 +73,8 @@ export const ssrPlugin = () => ({
           },
           tools: {
             bundlerChain(chain, { isServer, isServiceWorker, CHAIN_ID }) {
-              const userConfig2 = api.useResolvedConfigContext();
-              if (isUseSSRBundle(userConfig2) && !isServer && !isServiceWorker && hasStringSSREntry(userConfig2)) {
+              const userConfig = api.useResolvedConfigContext();
+              if (isUseSSRBundle(userConfig) && !isServer && !isServiceWorker && checkUseStringSSR(userConfig)) {
                 const LoadableBundlerPlugin = require("./loadable-bundler-plugin.js");
                 chain.plugin(CHAIN_ID.PLUGIN.LOADABLE).use(LoadableBundlerPlugin, [
                   {
@@ -77,7 +83,7 @@ export const ssrPlugin = () => ({
                 ]);
               }
             },
-            babel: babelConfig
+            babel: babelHandler
           }
         };
       },

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

@@ -9,13 +9,12 @@ import helmetReplace from "../helmet";
 import { RenderLevel } from "../types";
 import prefetch from "../../prefetch";
 import { ROUTER_DATA_JSON_ID, SSR_DATA_JSON_ID, attributesToString } from "../utils";
-import { createSSRReporter } from "../reporter";
-import { ServerTimingNames } from "../constants";
+import { SSRErrors, SSRTimings, createSSRTracker } from "../tracker";
 import { toFragments } from "./template";
 import { reduce } from "./reduce";
 import * as loadableRenderer from "./loadable";
 import * as styledComponentRenderer from "./styledComponent";
-const buildTemplateData = (context, data, renderLevel, reporter) => {
+const buildTemplateData = (context, data, renderLevel, tracker) => {
   const { request, enableUnsafeCtx } = context;
   const unsafeContext = {
     headers: request.headers
@@ -32,7 +31,7 @@ const buildTemplateData = (context, data, renderLevel, reporter) => {
         ...enableUnsafeCtx ? unsafeContext : {}
       },
       reporter: {
-        sessionId: reporter.sessionId
+        sessionId: tracker.sessionId
       }
     },
     renderLevel
@@ -61,7 +60,7 @@ class Entry {
       errors: serializeErrors(routerContext.errors)
     } : void 0;
     let html = "";
-    const templateData = buildTemplateData(ssrContext, prefetchData, this.result.renderLevel, this.reporter);
+    const templateData = buildTemplateData(ssrContext, prefetchData, this.result.renderLevel, this.tracker);
     const SSRData = this.getSSRDataScript(templateData, routerData);
     for (const fragment of this.fragments) {
       if (fragment.isVariable && fragment.content === "SSRDataScript") {
@@ -80,15 +79,10 @@ class Entry {
       prefetchData = await prefetch(this.App, context);
       this.result.renderLevel = RenderLevel.SERVER_PREFETCH;
       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(ServerTimingNames.SSR_PREFETCH, prefetchCost);
+      this.tracker.trackTiming(SSRTimings.SSR_PREFETCH, prefetchCost);
     } catch (e) {
       this.result.renderLevel = 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);
+      this.tracker.trackError(SSRErrors.PREFETCH, e);
     }
     return prefetchData || {};
   }
@@ -117,15 +111,10 @@ class Entry {
         (jsx) => ReactDomServer.renderToString(jsx)
       ]);
       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(ServerTimingNames.SSR_RENDER_HTML, cost);
+      this.tracker.trackTiming(SSRTimings.SSR_RENDER_HTML, cost);
       this.result.renderLevel = 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);
+      this.tracker.trackError(SSRErrors.RENDER_HTML, e);
     }
     return html;
   }
@@ -150,9 +139,7 @@ class Entry {
     _define_property(this, "entryName", void 0);
     _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, "tracker", void 0);
     _define_property(this, "template", void 0);
     _define_property(this, "App", void 0);
     _define_property(this, "fragments", void 0);
@@ -167,10 +154,8 @@ class Entry {
     this.host = host;
     this.App = options.App;
     this.pluginConfig = config;
-    this.reporter = createSSRReporter(ctx.reporter);
-    this.severTiming = ctx.serverTiming;
+    this.tracker = createSSRTracker(ctx);
     this.metrics = ctx.metrics;
-    this.logger = ctx.logger;
     this.nonce = nonce;
     this.result = {
       renderLevel: RenderLevel.CLIENT_RENDER,

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

@@ -1,7 +1,7 @@
 import { run } from "@modern-js/utils/runtime-node";
 import { time } from "@modern-js/utils/universal/time";
 import { PreRender } from "../../react/prerender";
-import { ServerTimingNames } from "../constants";
+import { SSRTimings } from "../tracker";
 import SSREntry from "./entry";
 export const render = ({ App, context, config }) => {
   const ssrContext = context.ssrContext;
@@ -15,10 +15,7 @@ export const render = ({ App, context, config }) => {
     const end = time();
     const html = await entry.renderToHtml(context);
     const cost = end();
-    entry.logger.info("App Render Total cost = %d ms", cost);
-    entry.metrics.emitTimer("app.render.cost", cost);
-    entry.reporter.reportTime("app_render_cost", cost);
-    entry.severTiming.addServeTiming(ServerTimingNames.SSR_RENDER_TOTAL, cost);
+    entry.tracker.trackTiming(SSRTimings.SSR_RENDER_TOTAL, cost);
     const cacheConfig = PreRender.config();
     if (cacheConfig) {
       context.ssrContext.cacheConfig = cacheConfig;

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

@@ -0,0 +1,64 @@
+export 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";
+})(SSRTimings || (SSRTimings = {}));
+export var SSRErrors;
+(function(SSRErrors2) {
+  SSRErrors2[SSRErrors2["PREFETCH"] = 0] = "PREFETCH";
+  SSRErrors2[SSRErrors2["RENDER_HTML"] = 1] = "RENDER_HTML";
+})(SSRErrors || (SSRErrors = {}));
+const errors = {
+  [SSRErrors.PREFETCH]: {
+    reporter: "SSR Error - App Prefetch Render",
+    logger: "App Prefetch Render",
+    metrics: "app.prefetch.render.error"
+  },
+  [SSRErrors.RENDER_HTML]: {
+    reporter: "SSR Error - App Render To HTML",
+    logger: "App Render To HTML",
+    metrics: "app.render.html.error"
+  }
+};
+const timings = {
+  [SSRTimings.SSR_PREFETCH]: {
+    reporter: "ssr-prefetch",
+    serverTiming: "ssr-prefetch",
+    metrics: "app.prefeth.cost",
+    logger: "App Prefetch cost = %d ms"
+  },
+  [SSRTimings.SSR_RENDER_HTML]: {
+    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"
+  }
+};
+export function createSSRTracker({ reporter, serverTiming, metrics, logger }) {
+  const tracker = {
+    get sessionId() {
+      return reporter.sessionId;
+    },
+    trackError(key, e) {
+      const { reporter: reporterContent, metrics: metricsContent, logger: loggerContent } = errors[key];
+      reporterContent && reporter.reportError(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];
+      reporterName && reporter.reportTiming(reporterName, cost);
+      serverTimingName && serverTiming.addServeTiming(serverTimingName, cost);
+      metricsName && metrics.emitTimer(metricsName, cost);
+      loggerName && logger.debug(loggerName, cost);
+    }
+  };
+  return tracker;
+}

package/dist/types/document/constants.d.ts

@@ -1,6 +1,9 @@
 export declare const DOC_EXT: string[];
 export declare const DOCUMENT_META_PLACEHOLDER: string;
 export declare const HTML_SEPARATOR = "<!--<?- html ?>-->";
+export declare const HEAD_PARTICALS_SEPARATOR: string;
+export declare const BODY_PARTICALS_SEPARATOR: string;
+export declare const TOP_PARTICALS_SEPARATOR: string;
 export declare const HTML_SSRDATASCRIPT_SEPARATOR = "<!--<?- SSRDataScript ?>-->";
 export declare const DOCUMENT_SSR_PLACEHOLDER: string;
 export declare const DOCUMENT_CHUNKSMAP_PLACEHOLDER: string;
@@ -8,7 +11,6 @@ export declare const DOCUMENT_SSRDATASCRIPT_PLACEHOLDER: string;
 export declare const DOCUMENT_FILE_NAME = "Document";
 export declare const DOCUMENT_SCRIPTS_PLACEHOLDER: string;
 export declare const DOCUMENT_LINKS_PLACEHOLDER: string;
-export declare const DOCUMENT_NO_SCRIPTE_PLACEHOLDER: string;
 export declare const DOCUMENT_SCRIPT_PLACEHOLDER_START: string;
 export declare const DOCUMENT_SCRIPT_PLACEHOLDER_END: string;
 export declare const DOCUMENT_STYLE_PLACEHOLDER_START: string;

package/dist/types/ssr/index.node.d.ts

@@ -1,5 +1,5 @@
 import type { Plugin } from '../core';
-import { SSRPluginConfig } from './serverRender/types';
+import type { SSRPluginConfig } from './serverRender/types';
 export declare const ssr: (config?: SSRPluginConfig) => Plugin;
 export default ssr;
 export * from './react';

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

@@ -1,5 +1,5 @@
 import { RuntimeContext, ModernSSRReactComponent, SSRPluginConfig } from '../types';
-import { SSRReporter } from '../reporter';
+import { SSRTracker } from '../tracker';
 import { SSRServerContext, RenderResult } from './type';
 type EntryOptions = {
   ctx: SSRServerContext;
@@ -10,9 +10,7 @@ export default class Entry {
   entryName: string;
   result: RenderResult;
   metrics: SSRServerContext['metrics'];
-  logger: SSRServerContext['logger'];
-  severTiming: SSRServerContext['serverTiming'];
-  reporter: SSRReporter;
+  tracker: SSRTracker;
   private readonly template;
   private readonly App;
   private readonly fragments;

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

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

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.29.0",
+  "version": "2.31.0",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -173,9 +173,9 @@
     "redux-logger": "^3.0.6",
     "styled-components": "^5.3.1",
     "@swc/helpers": "0.5.1",
-    "@modern-js/plugin": "2.29.0",
-    "@modern-js/types": "2.29.0",
-    "@modern-js/utils": "2.29.0"
+    "@modern-js/plugin": "2.31.0",
+    "@modern-js/types": "2.31.0",
+    "@modern-js/utils": "2.31.0"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -196,11 +196,11 @@
     "ts-jest": "^29.1.0",
     "typescript": "^5",
     "webpack": "^5.88.1",
-    "@modern-js/app-tools": "2.29.0",
-    "@modern-js/core": "2.29.0",
-    "@modern-js/server-core": "2.29.0",
-    "@scripts/build": "2.29.0",
-    "@scripts/jest-config": "2.29.0"
+    "@modern-js/app-tools": "2.31.0",
+    "@modern-js/core": "2.31.0",
+    "@modern-js/server-core": "2.31.0",
+    "@scripts/jest-config": "2.31.0",
+    "@scripts/build": "2.31.0"
   },
   "sideEffects": false,
   "publishConfig": {

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

@@ -1,27 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "createSSRReporter", {
-  enumerable: true,
-  get: function() {
-    return createSSRReporter;
-  }
-});
-function createSSRReporter(reporter) {
-  const _reporter = {
-    get sessionId() {
-      return reporter.sessionId;
-    },
-    get userId() {
-      return reporter.userId;
-    },
-    reportError(content, e) {
-      reporter.reportError(`SSR Error - ${content}`, e);
-    },
-    reportTime(name, cost) {
-      reporter.reportTiming(`ssr_${name}`, cost);
-    }
-  };
-  return _reporter;
-}

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

@@ -1,17 +0,0 @@
-export function createSSRReporter(reporter) {
-  var _reporter = {
-    get sessionId() {
-      return reporter.sessionId;
-    },
-    get userId() {
-      return reporter.userId;
-    },
-    reportError: function reportError(content, e) {
-      reporter.reportError("SSR Error - ".concat(content), e);
-    },
-    reportTime: function reportTime(name, cost) {
-      reporter.reportTiming("ssr_".concat(name), cost);
-    }
-  };
-  return _reporter;
-}

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

@@ -1,17 +0,0 @@
-export function createSSRReporter(reporter) {
-  const _reporter = {
-    get sessionId() {
-      return reporter.sessionId;
-    },
-    get userId() {
-      return reporter.userId;
-    },
-    reportError(content, e) {
-      reporter.reportError(`SSR Error - ${content}`, e);
-    },
-    reportTime(name, cost) {
-      reporter.reportTiming(`ssr_${name}`, cost);
-    }
-  };
-  return _reporter;
-}

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

@@ -1,8 +0,0 @@
-import { SSRServerContext } from './types';
-export type SSRReporter = ReturnType<typeof createSSRReporter>;
-export declare function createSSRReporter(reporter: SSRServerContext['reporter']): {
-  readonly sessionId: string | undefined;
-  readonly userId: string | undefined;
-  reportError(content: string, e: Error): void;
-  reportTime(name: string, cost: number): void;
-};