@modern-js/runtime 2.42.2 → 2.44.0

package/dist/cjs/cli/index.js

@@ -32,7 +32,6 @@ __export(cli_exports, {
   runtimePlugin: () => runtimePlugin
 });
 module.exports = __toCommonJS(cli_exports);
-var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
 var import_cli = require("../state/cli");
 var import_cli2 = require("../ssr/cli");
@@ -57,8 +56,8 @@ const runtimePlugin = () => ({
   setup: (api) => {
     return {
       config() {
-        const dir = api.useAppContext().internalDirectory || "";
-        process.env.IS_REACT18 = (0, import_utils.isReact18)(import_path.default.join(dir, "../../")).toString();
+        const appDir = api.useAppContext().appDirectory;
+        process.env.IS_REACT18 = (0, import_utils.isReact18)(appDir).toString();
         return {
           runtime: {},
           runtimeByEntries: {},

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

@@ -104,11 +104,11 @@ const ssrPlugin = () => ({
             }
           },
           tools: {
-            bundlerChain(chain, { isServer, isServiceWorker, CHAIN_ID }) {
+            bundlerChain(chain, { isServer, isServiceWorker }) {
               const userConfig = api.useResolvedConfigContext();
               if ((0, import_utils.isUseSSRBundle)(userConfig) && !isServer && !isServiceWorker && checkUseStringSSR(userConfig)) {
                 const LoadableBundlerPlugin = require("./loadable-bundler-plugin.js");
-                chain.plugin(CHAIN_ID.PLUGIN.LOADABLE).use(LoadableBundlerPlugin, [
+                chain.plugin("loadable").use(LoadableBundlerPlugin, [
                   {
                     filename: import_utils.LOADABLE_STATS_FILE
                   }
@@ -154,12 +154,13 @@ const ssrPlugin = () => ({
       },
       modifyEntryRuntimePlugins({ entrypoint, plugins, bundlerConfigs }) {
         if (ssrConfigMap.get(entrypoint.entryName)) {
-          var _bundlerConfigs_find_output, _bundlerConfigs_find, _config_server;
+          var _bundlerConfigs_find_output, _bundlerConfigs_find, _config_server, _config_server1;
           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({
@@ -169,7 +170,8 @@ const ssrPlugin = () => ({
               chunkLoadingGlobal,
               disablePrerender,
               enableInlineScripts: typeof enableInlineScripts === "function" ? void 0 : enableInlineScripts,
-              enableInlineStyles: typeof enableInlineStyles === "function" ? void 0 : enableInlineStyles
+              enableInlineStyles: typeof enableInlineStyles === "function" ? void 0 : enableInlineStyles,
+              unsafeHeaders
             })
           });
         }

package/dist/cjs/ssr/index.js

@@ -40,15 +40,15 @@ var import_parsed = require("@modern-js/runtime-utils/parsed");
 var import_types = require("./serverRender/types");
 var import_withCallback = require("./react/withCallback");
 var import_utils = require("./utils");
-var import_utils2 = require("./serverRender/utils");
+var import_constants = require("./serverRender/constants");
 __reExport(ssr_exports, require("./react"), module.exports);
 const ssr = (config) => ({
   name: "@modern-js/plugin-ssr",
   setup: () => {
     const mockResp = (0, import_utils.mockResponse)();
     if (config.inlineScript === false) {
-      window._SSR_DATA = (0, import_parsed.parsedJSONFromElement)(import_utils2.SSR_DATA_JSON_ID);
-      window._ROUTER_DATA = (0, import_parsed.parsedJSONFromElement)(import_utils2.ROUTER_DATA_JSON_ID);
+      window._SSR_DATA = (0, import_parsed.parsedJSONFromElement)(import_constants.SSR_DATA_JSON_ID);
+      window._ROUTER_DATA = (0, import_parsed.parsedJSONFromElement)(import_constants.ROUTER_DATA_JSON_ID);
     }
     return {
       client: async ({ App, context, ModernRender, ModernHydrate }) => {
@@ -60,6 +60,14 @@ const ssr = (config) => ({
           },
           _hydration: true
         };
+        const { ssrContext } = hydrateContext;
+        const { pathname: initialPathname } = ssrContext.request;
+        const currentPathname = window.location.pathname;
+        if (initialPathname !== currentPathname) {
+          const errorMsg = `The initial URL ${initialPathname} and the URL ${currentPathname} to be hydrated do not match, reload.`;
+          console.error(errorMsg);
+          window.location.reload();
+        }
         const callback = () => {
           delete hydrateContext._hydration;
         };

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

@@ -101,6 +101,7 @@ function factory(Component) {
       if (!validate) {
         throw new Error("invalid props, check usage");
       }
+      console.error("[Warn] PreRender has been deprecated, please use SSR Cache instead. reference to docs: https://modernjs.dev/guides/advanced-features/ssr.html");
       return (0, import_react.createElement)(Component, {
         ...newProps
       });

package/dist/cjs/ssr/serverRender/{renderToString/type.js → constants.js}

@@ -16,18 +16,28 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var type_exports = {};
-__export(type_exports, {
-  RenderLevel: () => RenderLevel
+var constants_exports = {};
+__export(constants_exports, {
+  CHUNK_CSS_PLACEHOLDER: () => CHUNK_CSS_PLACEHOLDER,
+  CHUNK_JS_PLACEHOLDER: () => CHUNK_JS_PLACEHOLDER,
+  HTML_PLACEHOLDER: () => HTML_PLACEHOLDER,
+  ROUTER_DATA_JSON_ID: () => ROUTER_DATA_JSON_ID,
+  SSR_DATA_JSON_ID: () => SSR_DATA_JSON_ID,
+  SSR_DATA_PLACEHOLDER: () => SSR_DATA_PLACEHOLDER
 });
-module.exports = __toCommonJS(type_exports);
-var RenderLevel;
-(function(RenderLevel2) {
-  RenderLevel2[RenderLevel2["CLIENT_RENDER"] = 0] = "CLIENT_RENDER";
-  RenderLevel2[RenderLevel2["SERVER_PREFETCH"] = 1] = "SERVER_PREFETCH";
-  RenderLevel2[RenderLevel2["SERVER_RENDER"] = 2] = "SERVER_RENDER";
-})(RenderLevel || (RenderLevel = {}));
+module.exports = __toCommonJS(constants_exports);
+const HTML_PLACEHOLDER = "<!--<?- html ?>-->";
+const SSR_DATA_PLACEHOLDER = "<!--<?- SSRDataScript ?>-->";
+const CHUNK_JS_PLACEHOLDER = "<!--<?- chunksMap.js ?>-->";
+const CHUNK_CSS_PLACEHOLDER = "<!--<?- chunksMap.css ?>-->";
+const SSR_DATA_JSON_ID = "__MODERN_SSR_DATA__";
+const ROUTER_DATA_JSON_ID = "__MODERN_ROUTER_DATA__";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  RenderLevel
+  CHUNK_CSS_PLACEHOLDER,
+  CHUNK_JS_PLACEHOLDER,
+  HTML_PLACEHOLDER,
+  ROUTER_DATA_JSON_ID,
+  SSR_DATA_JSON_ID,
+  SSR_DATA_PLACEHOLDER
 });

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

@@ -22,6 +22,7 @@ __export(helmet_exports, {
 });
 module.exports = __toCommonJS(helmet_exports);
 var import_os = require("os");
+var import_utils = require("./utils");
 const RE_HTML_ATTR = /<html[^>]*>/;
 const RE_BODY_ATTR = /<body[^>]*>/;
 const RE_LAST_IN_HEAD = /<\/head>/;
@@ -31,11 +32,11 @@ function helmet(content, helmetData) {
   let result = content;
   const bodyAttributes = helmetData.bodyAttributes.toString();
   if (bodyAttributes) {
-    result = result.replace(RE_BODY_ATTR, `<body ${bodyAttributes}>`);
+    result = (0, import_utils.safeReplace)(result, RE_BODY_ATTR, `<body ${bodyAttributes}>`);
   }
   const htmlAttributes = helmetData.htmlAttributes.toString();
   if (htmlAttributes) {
-    result = result.replace(RE_HTML_ATTR, `<html ${htmlAttributes}>`);
+    result = (0, import_utils.safeReplace)(result, RE_HTML_ATTR, `<html ${htmlAttributes}>`);
   }
   const base = helmetData.base.toString();
   const link = helmetData.link.toString();
@@ -47,7 +48,7 @@ function helmet(content, helmetData) {
   const existTitleTag = RE_TITLE.test(content);
   const shouldReplaceTitle = existTitleTag && TEST_TITLE_CONTENT.test(title.trim());
   if (shouldReplaceTitle) {
-    result = result.replace(RE_TITLE, title);
+    result = (0, import_utils.safeReplace)(result, RE_TITLE, title);
   }
   const helmetStr = [
     base,
@@ -60,5 +61,5 @@ function helmet(content, helmetData) {
   ].reduce((pre, cur) => {
     return pre + (cur.length > 0 ? `  ${cur}${import_os.EOL}` : "");
   }, "");
-  return result.replace(RE_LAST_IN_HEAD, `${helmetStr}</head>`);
+  return (0, import_utils.safeReplace)(result, RE_LAST_IN_HEAD, `${helmetStr}</head>`);
 }

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

@@ -22,12 +22,12 @@ __export(serverRender_exports, {
 });
 module.exports = __toCommonJS(serverRender_exports);
 var import_utils = require("../utils");
-var import_utils2 = require("./utils");
+var import_constants = require("./constants");
 async function serverRender(options) {
   var _options_context_ssrContext;
   if ((_options_context_ssrContext = options.context.ssrContext) === null || _options_context_ssrContext === void 0 ? void 0 : _options_context_ssrContext.template) {
     var _options_context_ssrContext1;
-    options.context.ssrContext.template = (_options_context_ssrContext1 = options.context.ssrContext) === null || _options_context_ssrContext1 === void 0 ? void 0 : _options_context_ssrContext1.template.replace("</head>", `${import_utils2.CSS_CHUNKS_PLACEHOLDER}</head>`);
+    options.context.ssrContext.template = (_options_context_ssrContext1 = options.context.ssrContext) === null || _options_context_ssrContext1 === void 0 ? void 0 : _options_context_ssrContext1.template.replace("</head>", `${import_constants.CHUNK_CSS_PLACEHOLDER}</head>`);
   }
   if ((0, import_utils.isReact18)() && options.config.mode === "stream") {
     const pipe = await require("./renderToStream").render(options);

package/dist/cjs/ssr/serverRender/renderToStream/buildTemplate.after.js

@@ -23,6 +23,7 @@ __export(buildTemplate_after_exports, {
 module.exports = __toCommonJS(buildTemplate_after_exports);
 var import_node = require("@modern-js/runtime-utils/node");
 var import_utils = require("../utils");
+var import_constants = require("../constants");
 var import_buildTemplate = require("./buildTemplate.share");
 function buildShellAfterTemplate(afterAppTemplate, options) {
   const callbacks = [
@@ -31,7 +32,7 @@ function buildShellAfterTemplate(afterAppTemplate, options) {
   return (0, import_buildTemplate.buildTemplate)(afterAppTemplate, callbacks);
   function injectSSRDataScript(template) {
     const ssrDataScript = buildSSRDataScript();
-    return template.replace("<!--<?- SSRDataScript ?>-->", ssrDataScript);
+    return (0, import_utils.safeReplace)(template, import_constants.SSR_DATA_PLACEHOLDER, ssrDataScript);
     function buildSSRDataScript() {
       const { context: { ssrContext, initialData, __i18nData__ }, renderLevel } = options;
       const { request, enableUnsafeCtx, nonce, tracker } = ssrContext;

package/dist/cjs/ssr/serverRender/renderToStream/buildTemplate.share.js

@@ -24,7 +24,7 @@ __export(buildTemplate_share_exports, {
 module.exports = __toCommonJS(buildTemplate_share_exports);
 const HEAD_REG_EXP = /<head(.|\n)*>(.|\n)*<\/head>/;
 function buildTemplate(template, callbacks) {
-  return callbacks.reduce((template2, buildTemplateCb) => buildTemplateCb(template2), template);
+  return callbacks.reduce((promise, buildTemplateCb) => promise.then((template2) => buildTemplateCb(template2)), Promise.resolve(template));
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/ssr/serverRender/renderToStream/bulidTemplate.before.js

@@ -34,9 +34,27 @@ module.exports = __toCommonJS(bulidTemplate_before_exports);
 var import_react_helmet = __toESM(require("react-helmet"));
 var import_router = require("@modern-js/runtime-utils/router");
 var import_helmet = __toESM(require("../helmet"));
+var import_constants = require("../constants");
 var import_utils = require("../utils");
 var import_buildTemplate = require("./buildTemplate.share");
-function getHeadTemplate(beforeEntryTemplate, context) {
+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.join(__dirname, chunk);
+  return fs.readFile(filepath, "utf-8");
+};
+const checkIsInline = (chunk, enableInline) => {
+  if (process.env.NODE_ENV === "production") {
+    if (enableInline instanceof RegExp) {
+      return enableInline.test(chunk);
+    } else {
+      return Boolean(enableInline);
+    }
+  } else {
+    return false;
+  }
+};
+function getHeadTemplate(beforeEntryTemplate, context, pluginConfig) {
   const callbacks = [
     (headTemplate2) => {
       const helmetData = import_react_helmet.default.renderStatic();
@@ -50,9 +68,10 @@ function getHeadTemplate(beforeEntryTemplate, context) {
     return "";
   }
   return (0, import_buildTemplate.buildTemplate)(headTemplate, callbacks);
-  function injectCss(headTemplate2) {
-    return headTemplate2.replace(import_utils.CSS_CHUNKS_PLACEHOLDER, getCssChunks());
-    function getCssChunks() {
+  async function injectCss(headTemplate2) {
+    const css = await getCssChunks();
+    return (0, import_utils.safeReplace)(headTemplate2, import_constants.CHUNK_CSS_PLACEHOLDER, css);
+    async function getCssChunks() {
       const { routeManifest, routerContext, routes } = context;
       if (!routeManifest || !routerContext || !routes) {
         return "";
@@ -74,15 +93,23 @@ function getHeadTemplate(beforeEntryTemplate, context) {
           }
         }
       });
-      const styleLinks = cssChunks.map((chunk) => {
-        return `<link href="${chunk}" rel="stylesheet" />`;
-      });
-      return `${styleLinks.join("")}`;
+      const { enableInlineStyles } = pluginConfig;
+      const styles = await Promise.all(cssChunks.map(async (chunk) => {
+        const link = `<link href="${chunk}" rel="stylesheet" />`;
+        if ((0, import_utils.checkIsNode)() && checkIsInline(chunk, enableInlineStyles)) {
+          return readAsset(chunk).then((content) => `<style>${content}</style>`).catch((_) => {
+            return link;
+          });
+        } else {
+          return link;
+        }
+      }));
+      return `${styles.join("")}`;
     }
   }
 }
-function buildShellBeforeTemplate(beforeAppTemplate, context) {
-  const headTemplate = getHeadTemplate(beforeAppTemplate, context);
+async function buildShellBeforeTemplate(beforeAppTemplate, context, pluginConfig) {
+  const headTemplate = await getHeadTemplate(beforeAppTemplate, context, pluginConfig);
   return beforeAppTemplate.replace(import_buildTemplate.HEAD_REG_EXP, headTemplate);
 }
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -34,10 +34,9 @@ module.exports = __toCommonJS(renderToStream_exports);
 var import_react = require("react");
 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_renderToPipe = __toESM(require("./renderToPipe"));
-const render = ({ App, context }) => {
+const render = ({ App, context, config }) => {
   const { ssrContext } = context;
   if (!ssrContext) {
     throw new Error('The "ssrContext" must not be undefined, but received undefined');
@@ -50,12 +49,8 @@ const render = ({ App, context }) => {
       })
     });
     const { tracker } = ssrContext;
-    const pipe = (0, import_renderToPipe.default)(rootElement, context, {
+    const pipe = (0, import_renderToPipe.default)(rootElement, context, config, {
       onShellReady() {
-        const cacheConfig = import_prerender.PreRender.config();
-        if (cacheConfig) {
-          ssrContext.cacheConfig = cacheConfig;
-        }
         const cost = end();
         tracker.trackTiming(import_tracker.SSRTimings.RENDER_SHELL, cost);
       },

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

@@ -30,7 +30,7 @@ var ShellChunkStatus;
   ShellChunkStatus2[ShellChunkStatus2["START"] = 0] = "START";
   ShellChunkStatus2[ShellChunkStatus2["FINIESH"] = 1] = "FINIESH";
 })(ShellChunkStatus || (ShellChunkStatus = {}));
-function renderToPipe(rootElement, context, options) {
+function renderToPipe(rootElement, context, pluginConfig, options) {
   let shellChunkStatus = 0;
   const { ssrContext } = context;
   const chunkVec = [];
@@ -45,41 +45,43 @@ function renderToPipe(rootElement, context, options) {
         ...options,
         nonce: ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.nonce,
         onShellReady() {
-          var _options_onShellReady;
-          const { shellAfter, shellBefore } = (0, import_template.getTemplates)(context, import_types.RenderLevel.SERVER_RENDER);
-          options === null || options === void 0 ? void 0 : (_options_onShellReady = options.onShellReady) === null || _options_onShellReady === void 0 ? void 0 : _options_onShellReady.call(options);
-          const injectableTransform = new import_stream.Transform({
-            transform(chunk, _encoding, callback) {
-              try {
-                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 = 1;
-                    this.push(`${shellBefore}${concatedChunk}${shellAfter}`);
+          (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);
+            const injectableTransform = new import_stream.Transform({
+              transform(chunk, _encoding, callback) {
+                try {
+                  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 = 1;
+                      this.push(`${shellBefore}${concatedChunk}${shellAfter}`);
+                    }
+                  } else {
+                    this.push(chunk);
+                  }
+                  callback();
+                } catch (e) {
+                  if (e instanceof Error) {
+                    callback(e);
+                  } else {
+                    callback(new Error("Received unkown error when streaming"));
                   }
-                } else {
-                  this.push(chunk);
-                }
-                callback();
-              } catch (e) {
-                if (e instanceof Error) {
-                  callback(e);
-                } else {
-                  callback(new Error("Received unkown error when streaming"));
                 }
               }
-            }
+            });
+            resolve(pipe(injectableTransform).pipe(stream));
           });
-          resolve(pipe(injectableTransform).pipe(stream));
         },
         onShellError(error) {
-          var _options_onShellError;
-          const { shellAfter, shellBefore } = (0, import_template.getTemplates)(context, import_types.RenderLevel.CLIENT_RENDER);
-          const fallbackHtml = `${shellBefore}${shellAfter}`;
-          resolve(fallbackHtml);
-          options === null || options === void 0 ? void 0 : (_options_onShellError = options.onShellError) === null || _options_onShellError === void 0 ? void 0 : _options_onShellError.call(options, error);
+          (0, import_template.getTemplates)(context, import_types.RenderLevel.CLIENT_RENDER, pluginConfig).then(({ shellAfter, shellBefore }) => {
+            var _options_onShellError;
+            const fallbackHtml = `${shellBefore}${shellAfter}`;
+            resolve(fallbackHtml);
+            options === null || options === void 0 ? void 0 : (_options_onShellError = options.onShellError) === null || _options_onShellError === void 0 ? void 0 : _options_onShellError.call(options, error);
+          });
         }
       });
     });

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

@@ -30,7 +30,7 @@ var ShellChunkStatus;
   ShellChunkStatus2[ShellChunkStatus2["START"] = 0] = "START";
   ShellChunkStatus2[ShellChunkStatus2["FINIESH"] = 1] = "FINIESH";
 })(ShellChunkStatus || (ShellChunkStatus = {}));
-function renderToPipe(rootElement, context, options) {
+function renderToPipe(rootElement, context, pluginConfig, options) {
   let shellChunkStatus = 0;
   const chunkVec = [];
   const { ssrContext } = context;
@@ -40,7 +40,7 @@ function renderToPipe(rootElement, context, options) {
       ({ renderToReadableStream } = require("react-dom/server"));
     } catch (e) {
     }
-    const { shellAfter, shellBefore } = (0, import_template.getTemplates)(context, import_types.RenderLevel.SERVER_RENDER);
+    const { shellAfter, shellBefore } = await (0, import_template.getTemplates)(context, import_types.RenderLevel.SERVER_RENDER, pluginConfig);
     try {
       const readableOriginal = await renderToReadableStream(rootElement, {
         ...options,
@@ -79,7 +79,7 @@ function renderToPipe(rootElement, context, options) {
       return injectableStream;
     } catch (err) {
       ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.tracker.trackError(import_tracker.SSRErrors.RENDER_SHELL, err);
-      const { shellAfter: shellAfter2, shellBefore: shellBefore2 } = (0, import_template.getTemplates)(context, import_types.RenderLevel.CLIENT_RENDER);
+      const { shellAfter: shellAfter2, shellBefore: shellBefore2 } = await (0, import_template.getTemplates)(context, import_types.RenderLevel.CLIENT_RENDER, pluginConfig);
       const fallbackHtml = `${shellBefore2}${shellAfter2}`;
       return fallbackHtml;
     }

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

@@ -24,11 +24,11 @@ module.exports = __toCommonJS(template_exports);
 var import_buildTemplate = require("./buildTemplate.after");
 var import_bulidTemplate = require("./bulidTemplate.before");
 const HTML_SEPARATOR = "<!--<?- html ?>-->";
-const getTemplates = (context, renderLevel) => {
+const getTemplates = async (context, renderLevel, pluginConfig) => {
   const { ssrContext } = context;
   const [beforeAppTemplate = "", afterAppHtmlTemplate = ""] = ssrContext.template.split(HTML_SEPARATOR) || [];
-  const builtBeforeTemplate = (0, import_bulidTemplate.buildShellBeforeTemplate)(beforeAppTemplate, context);
-  const builtAfterTemplate = (0, import_buildTemplate.buildShellAfterTemplate)(afterAppHtmlTemplate, {
+  const builtBeforeTemplate = await (0, import_bulidTemplate.buildShellBeforeTemplate)(beforeAppTemplate, context, pluginConfig);
+  const builtAfterTemplate = await (0, import_buildTemplate.buildShellAfterTemplate)(afterAppHtmlTemplate, {
     context,
     renderLevel
   });

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

@@ -25,28 +25,22 @@ __export(buildHtml_exports, {
   createReplaceSSRDataScript: () => createReplaceSSRDataScript
 });
 module.exports = __toCommonJS(buildHtml_exports);
-function unsafeReplace(source, searchValue, replaceValue) {
-  const [s1, s2] = source.split(searchValue);
-  return s1 + replaceValue + s2;
-}
+var import_utils = require("../utils");
+var import_constants = require("../constants");
 function buildHtml(template, callbacks) {
   return callbacks.reduce((tmp, cb) => cb(tmp), template);
 }
 function createReplaceHtml(html) {
-  const HTML_REMARK = "<!--<?- html ?>-->";
-  return (template) => unsafeReplace(template, HTML_REMARK, html);
+  return (template) => (0, import_utils.safeReplace)(template, import_constants.HTML_PLACEHOLDER, html);
 }
 function createReplaceSSRDataScript(data) {
-  const SSR_DATA_REMARK = "<!--<?- SSRDataScript ?>-->";
-  return (template) => unsafeReplace(template, SSR_DATA_REMARK, data);
+  return (template) => (0, import_utils.safeReplace)(template, import_constants.SSR_DATA_PLACEHOLDER, data);
 }
 function createReplaceChunkJs(js) {
-  const CHUNK_JS_REMARK = "<!--<?- chunksMap.js ?>-->";
-  return (template) => unsafeReplace(template, CHUNK_JS_REMARK, js);
+  return (template) => (0, import_utils.safeReplace)(template, import_constants.CHUNK_JS_PLACEHOLDER, js);
 }
 function createReplaceChunkCss(css) {
-  const CHUNK_CSS_REG = "<!--<?- chunksMap.css ?>-->";
-  return (template) => unsafeReplace(template, CHUNK_CSS_REG, css);
+  return (template) => (0, import_utils.safeReplace)(template, import_constants.CHUNK_CSS_PLACEHOLDER, css);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -40,17 +40,20 @@ var import_utils = require("../../../router/runtime/utils");
 var import_helmet = __toESM(require("../helmet"));
 var import_types = require("../types");
 var import_prefetch = __toESM(require("../../prefetch"));
+var import_constants = require("../constants");
 var import_utils2 = require("../utils");
 var import_tracker = require("../tracker");
 var import_loadable = require("./loadable");
 var import_render = require("./render");
 var import_styledComponent = require("./styledComponent");
 var import_buildHtml = require("./buildHtml");
-const buildTemplateData = (context, data, renderLevel, tracker) => {
-  const { request, enableUnsafeCtx } = context;
-  const unsafeContext = {
-    headers: request.headers
-  };
+const buildTemplateData = (context, data, renderLevel, tracker, config) => {
+  const { request } = context;
+  const { unsafeHeaders } = config;
+  const headers = unsafeHeaders ? Object.fromEntries(Object.entries(request.headers).filter(([key, _]) => {
+    var _unsafeHeaders_map;
+    return unsafeHeaders === null || unsafeHeaders === void 0 ? void 0 : (_unsafeHeaders_map = unsafeHeaders.map((header) => header.toLowerCase())) === null || _unsafeHeaders_map === void 0 ? void 0 : _unsafeHeaders_map.includes(key.toLowerCase());
+  })) : void 0;
   return {
     data,
     context: {
@@ -60,7 +63,7 @@ const buildTemplateData = (context, data, renderLevel, tracker) => {
         pathname: request.pathname,
         host: request.host,
         url: request.url,
-        ...enableUnsafeCtx ? unsafeContext : {}
+        headers
       },
       reporter: {
         sessionId: tracker.sessionId
@@ -69,8 +72,7 @@ const buildTemplateData = (context, data, renderLevel, tracker) => {
     renderLevel
   };
 };
-var Entry;
-Entry = class Entry2 {
+class Entry {
   async renderToHtml(context) {
     var _ssrContext_redirection, _ssrContext_redirection1, _ssrContext_redirection2;
     const ssrContext = context.ssrContext;
@@ -92,7 +94,7 @@ Entry = class Entry2 {
       loaderData: routerContext.loaderData,
       errors: (0, import_utils.serializeErrors)(routerContext.errors)
     } : void 0;
-    const templateData = buildTemplateData(ssrContext, prefetchData, this.result.renderLevel, this.tracker);
+    const templateData = buildTemplateData(ssrContext, prefetchData, this.result.renderLevel, this.tracker, this.pluginConfig);
     const ssrDataScripts = this.getSSRDataScript(templateData, routerData);
     const html = (0, import_buildHtml.buildHtml)(this.template, [
       (0, import_buildHtml.createReplaceChunkCss)(this.result.chunksMap.css),
@@ -147,12 +149,12 @@ Entry = class Entry2 {
     const attrsStr = (0, import_utils2.attributesToString)({
       nonce: this.nonce
     });
-    let ssrDataScripts = useInlineScript ? `<script${attrsStr}>window._SSR_DATA = ${ssrData}</script>` : `<script type="application/json" id="${import_utils2.SSR_DATA_JSON_ID}">${ssrData}</script>`;
+    let ssrDataScripts = useInlineScript ? `<script${attrsStr}>window._SSR_DATA = ${ssrData}</script>` : `<script type="application/json" id="${import_constants.SSR_DATA_JSON_ID}">${ssrData}</script>`;
     if (routerData) {
       const serializedRouterData = (0, import_node.serializeJson)(routerData);
       ssrDataScripts += useInlineScript ? `
 <script${attrsStr}>window._ROUTER_DATA = ${serializedRouterData}</script>` : `
-<script type="application/json" id="${import_utils2.ROUTER_DATA_JSON_ID}">${serializedRouterData}</script>`;
+<script type="application/json" id="${import_constants.ROUTER_DATA_JSON_ID}">${serializedRouterData}</script>`;
     }
     return ssrDataScripts;
   }
@@ -187,4 +189,4 @@ Entry = class Entry2 {
       }
     };
   }
-};
+}

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

@@ -32,7 +32,6 @@ __export(renderToString_exports, {
 });
 module.exports = __toCommonJS(renderToString_exports);
 var import_node = require("@modern-js/runtime-utils/node");
-var import_prerender = require("../../react/prerender");
 var import_entry = __toESM(require("./entry"));
 const render = ({ App, context, config }) => {
   const ssrContext = context.ssrContext;
@@ -44,10 +43,6 @@ const render = ({ App, context, config }) => {
     });
     entry.metrics.emitCounter("app.visit.count", 1);
     const html = await entry.renderToHtml(context);
-    const cacheConfig = import_prerender.PreRender.config();
-    if (cacheConfig) {
-      context.ssrContext.cacheConfig = cacheConfig;
-    }
     return html;
   });
 };

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

@@ -58,10 +58,6 @@ const readAsset = async (chunk) => {
   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";
-};
 class LoadableCollector {
   get existsAssets() {
     var _routeManifest_routeAssets_entryName, _routeManifest_routeAssets;
@@ -121,7 +117,7 @@ class LoadableCollector {
       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()) {
+      if ((0, import_utils.checkIsNode)() && checkIsInline(chunk, enableInlineScripts)) {
         return readAsset(chunk).then((content) => `<script>${content}</script>`).catch((_) => {
           return script;
         });
@@ -140,7 +136,7 @@ class LoadableCollector {
       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()) {
+      if ((0, import_utils.checkIsNode)() && checkIsInline(chunk, enableInlineStyles)) {
         return readAsset(chunk).then((content) => `<style>${content}</style>`).catch((_) => {
           return link;
         });

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

@@ -18,10 +18,15 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var types_exports = {};
 __export(types_exports, {
-  RenderLevel: () => import_type.RenderLevel
+  RenderLevel: () => RenderLevel
 });
 module.exports = __toCommonJS(types_exports);
-var import_type = require("./renderToString/type");
+var RenderLevel;
+(function(RenderLevel2) {
+  RenderLevel2[RenderLevel2["CLIENT_RENDER"] = 0] = "CLIENT_RENDER";
+  RenderLevel2[RenderLevel2["SERVER_PREFETCH"] = 1] = "SERVER_PREFETCH";
+  RenderLevel2[RenderLevel2["SERVER_RENDER"] = 2] = "SERVER_RENDER";
+})(RenderLevel || (RenderLevel = {}));
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   RenderLevel