@modern-js/runtime 2.42.1 → 2.43.0

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

@@ -3,7 +3,8 @@ import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import ReactHelmet from "react-helmet";
 import { matchRoutes } from "@modern-js/runtime-utils/router";
 import helmetReplace from "../helmet";
-import { CSS_CHUNKS_PLACEHOLDER } from "../utils";
+import { CHUNK_CSS_PLACEHOLDER } from "../constants";
+import { safeReplace } from "../utils";
 import { HEAD_REG_EXP, buildTemplate } from "./buildTemplate.share";
 function getHeadTemplate(beforeEntryTemplate, context) {
   var callbacks = [
@@ -20,7 +21,7 @@ function getHeadTemplate(beforeEntryTemplate, context) {
   }
   return buildTemplate(headTemplate, callbacks);
   function injectCss(headTemplate2) {
-    return headTemplate2.replace(CSS_CHUNKS_PLACEHOLDER, getCssChunks());
+    return safeReplace(headTemplate2, CHUNK_CSS_PLACEHOLDER, getCssChunks());
     function getCssChunks() {
       var routeManifest = context.routeManifest, routerContext = context.routerContext, routes = context.routes;
       if (!routeManifest || !routerContext || !routes) {

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

@@ -3,7 +3,6 @@ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { createElement } from "react";
 import { run } from "@modern-js/runtime-utils/node";
 import { time } from "@modern-js/runtime-utils/time";
-import { PreRender } from "../../react/prerender";
 import { SSRErrors, SSRTimings } from "../tracker";
 import renderToPipe from "./renderToPipe";
 var render = function(param) {
@@ -24,10 +23,6 @@ var render = function(param) {
       tracker = ssrContext.tracker;
       pipe = renderToPipe(rootElement, context, {
         onShellReady: function onShellReady() {
-          var cacheConfig = PreRender.config();
-          if (cacheConfig) {
-            ssrContext.cacheConfig = cacheConfig;
-          }
           var cost = end();
           tracker.trackTiming(SSRTimings.RENDER_SHELL, cost);
         },

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

@@ -1,30 +1,28 @@
+import { safeReplace } from "../utils";
+import { HTML_PLACEHOLDER, SSR_DATA_PLACEHOLDER, CHUNK_JS_PLACEHOLDER, CHUNK_CSS_PLACEHOLDER } from "../constants";
 function buildHtml(template, callbacks) {
   return callbacks.reduce(function(tmp, cb) {
     return cb(tmp);
   }, template);
 }
 function createReplaceHtml(html) {
-  var HTML_REG = /<!--<\?-\s*html\s*\?>-->/;
   return function(template) {
-    return template.replace(HTML_REG, html);
+    return safeReplace(template, HTML_PLACEHOLDER, html);
   };
 }
 function createReplaceSSRDataScript(data) {
-  var SSR_DATA_REG = /<!--<\?-\s*SSRDataScript\s*\?>-->/;
   return function(template) {
-    return template.replace(SSR_DATA_REG, data);
+    return safeReplace(template, SSR_DATA_PLACEHOLDER, data);
   };
 }
 function createReplaceChunkJs(js) {
-  var CHUNK_JS_REG = /<!--<\?-\s*chunksMap\.js\s*\?>-->/;
   return function(template) {
-    return template.replace(CHUNK_JS_REG, js);
+    return safeReplace(template, CHUNK_JS_PLACEHOLDER, js);
   };
 }
 function createReplaceChunkCss(css) {
-  var CHUNK_CSS_REG = /<!--<\?-\s*chunksMap\.css\s*\?>-->/;
   return function(template) {
-    return template.replace(CHUNK_CSS_REG, css);
+    return safeReplace(template, CHUNK_CSS_PLACEHOLDER, css);
   };
 }
 export {

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

@@ -2,7 +2,7 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
 import { _ as _create_class } from "@swc/helpers/_/_create_class";
 import { _ as _define_property } from "@swc/helpers/_/_define_property";
-import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
+import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import React from "react";
@@ -13,27 +13,34 @@ import { serializeErrors } from "../../../router/runtime/utils";
 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 { ROUTER_DATA_JSON_ID, SSR_DATA_JSON_ID } from "../constants";
+import { attributesToString } from "../utils";
 import { SSRErrors, SSRTimings } from "../tracker";
 import { createLoadableCollector } from "./loadable";
 import { createRender } from "./render";
 import { createStyledCollector } from "./styledComponent";
 import { buildHtml, createReplaceChunkCss, createReplaceChunkJs, createReplaceHtml, createReplaceSSRDataScript } from "./buildHtml";
-var buildTemplateData = function(context, data, renderLevel, tracker) {
-  var request = context.request, enableUnsafeCtx = context.enableUnsafeCtx;
-  var unsafeContext = {
-    headers: request.headers
-  };
+var buildTemplateData = function(context, data, renderLevel, tracker, config) {
+  var request = context.request;
+  var unsafeHeaders = config.unsafeHeaders;
+  var headers = unsafeHeaders ? Object.fromEntries(Object.entries(request.headers).filter(function(param) {
+    var _param = _sliced_to_array(param, 2), key = _param[0], _ = _param[1];
+    var _unsafeHeaders_map;
+    return unsafeHeaders === null || unsafeHeaders === void 0 ? void 0 : (_unsafeHeaders_map = unsafeHeaders.map(function(header) {
+      return header.toLowerCase();
+    })) === null || _unsafeHeaders_map === void 0 ? void 0 : _unsafeHeaders_map.includes(key.toLowerCase());
+  })) : void 0;
   return {
     data,
     context: {
-      request: _object_spread({
+      request: {
         params: request.params,
         query: request.query,
         pathname: request.pathname,
         host: request.host,
-        url: request.url
-      }, enableUnsafeCtx ? unsafeContext : {}),
+        url: request.url,
+        headers
+      },
       reporter: {
         sessionId: tracker.sessionId
       }
@@ -41,8 +48,7 @@ var buildTemplateData = function(context, data, renderLevel, tracker) {
     renderLevel
   };
 };
-var Entry;
-Entry = /* @__PURE__ */ function() {
+var Entry = /* @__PURE__ */ function() {
   "use strict";
   function Entry2(options) {
     _class_call_check(this, Entry2);
@@ -130,13 +136,13 @@ Entry = /* @__PURE__ */ function() {
                   loaderData: routerContext.loaderData,
                   errors: serializeErrors(routerContext.errors)
                 } : void 0;
-                templateData = buildTemplateData(ssrContext, prefetchData, _this.result.renderLevel, _this.tracker);
+                templateData = buildTemplateData(ssrContext, prefetchData, _this.result.renderLevel, _this.tracker, _this.pluginConfig);
                 ssrDataScripts = _this.getSSRDataScript(templateData, routerData);
                 html = buildHtml(_this.template, [
                   createReplaceChunkCss(_this.result.chunksMap.css),
                   createReplaceChunkJs(_this.result.chunksMap.js),
-                  createReplaceHtml(_this.result.html || ""),
-                  createReplaceSSRDataScript(ssrDataScripts)
+                  createReplaceSSRDataScript(ssrDataScripts),
+                  createReplaceHtml(_this.result.html || "")
                 ].concat(_to_consumable_array(_this.htmlModifiers)));
                 helmetData = ReactHelmet.renderStatic();
                 return [

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

@@ -1,13 +1,12 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { run } from "@modern-js/runtime-utils/node";
-import { PreRender } from "../../react/prerender";
 import SSREntry from "./entry";
 var render = function(param) {
   var App = param.App, context = param.context, config = param.config;
   var ssrContext = context.ssrContext;
   return run(ssrContext.request.headers, /* @__PURE__ */ _async_to_generator(function() {
-    var entry, html, cacheConfig;
+    var entry, html;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -23,10 +22,6 @@ var render = function(param) {
           ];
         case 1:
           html = _state.sent();
-          cacheConfig = PreRender.config();
-          if (cacheConfig) {
-            context.ssrContext.cacheConfig = cacheConfig;
-          }
           return [
             2,
             html

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

@@ -1,4 +1,9 @@
-import { RenderLevel } from "./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 = {}));
 export {
   RenderLevel
 };

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

@@ -1,16 +1,16 @@
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
-var CSS_CHUNKS_PLACEHOLDER = "<!--<?- chunksMap.css ?>-->";
-var SSR_DATA_JSON_ID = "__MODERN_SSR_DATA__";
-var ROUTER_DATA_JSON_ID = "__MODERN_ROUTER_DATA__";
 function attributesToString(attributes) {
   return Object.entries(attributes).reduce(function(str, param) {
     var _param = _sliced_to_array(param, 2), key = _param[0], value = _param[1];
     return value === void 0 ? str : "".concat(str, " ").concat(key, '="').concat(value, '"');
   }, "");
 }
+function safeReplace(source, searchValue, replaceValue) {
+  return source.replace(searchValue, function() {
+    return replaceValue;
+  });
+}
 export {
-  CSS_CHUNKS_PLACEHOLDER,
-  ROUTER_DATA_JSON_ID,
-  SSR_DATA_JSON_ID,
-  attributesToString
+  attributesToString,
+  safeReplace
 };

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

@@ -1,4 +1,3 @@
-import path from "path";
 import { isReact18, cleanRequireCache } from "@modern-js/utils";
 import { statePlugin } from "../state/cli";
 import { ssrPlugin } from "../ssr/cli";
@@ -23,8 +22,8 @@ const runtimePlugin = () => ({
   setup: (api) => {
     return {
       config() {
-        const dir = api.useAppContext().internalDirectory || "";
-        process.env.IS_REACT18 = isReact18(path.join(dir, "../../")).toString();
+        const appDir = api.useAppContext().appDirectory;
+        process.env.IS_REACT18 = isReact18(appDir).toString();
         return {
           runtime: {},
           runtimeByEntries: {},

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

@@ -70,11 +70,11 @@ const ssrPlugin = () => ({
             }
           },
           tools: {
-            bundlerChain(chain, { isServer, isServiceWorker, CHAIN_ID }) {
+            bundlerChain(chain, { isServer, isServiceWorker }) {
               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, [
+                chain.plugin("loadable").use(LoadableBundlerPlugin, [
                   {
                     filename: LOADABLE_STATS_FILE
                   }
@@ -120,12 +120,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({
@@ -135,7 +136,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/esm-node/ssr/index.js

@@ -5,7 +5,7 @@ import { parsedJSONFromElement } from "@modern-js/runtime-utils/parsed";
 import { RenderLevel } from "./serverRender/types";
 import { WithCallback } from "./react/withCallback";
 import { formatClient, mockResponse, isReact18 } from "./utils";
-import { ROUTER_DATA_JSON_ID, SSR_DATA_JSON_ID } from "./serverRender/utils";
+import { ROUTER_DATA_JSON_ID, SSR_DATA_JSON_ID } from "./serverRender/constants";
 const ssr = (config) => ({
   name: "@modern-js/plugin-ssr",
   setup: () => {
@@ -24,6 +24,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/esm-node/ssr/react/prerender/index.js

@@ -68,6 +68,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 createElement(Component, {
         ...newProps
       });

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

@@ -0,0 +1,14 @@
+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__";
+export {
+  CHUNK_CSS_PLACEHOLDER,
+  CHUNK_JS_PLACEHOLDER,
+  HTML_PLACEHOLDER,
+  ROUTER_DATA_JSON_ID,
+  SSR_DATA_JSON_ID,
+  SSR_DATA_PLACEHOLDER
+};

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

@@ -1,4 +1,5 @@
 import { EOL } from "os";
+import { safeReplace } from "./utils";
 const RE_HTML_ATTR = /<html[^>]*>/;
 const RE_BODY_ATTR = /<body[^>]*>/;
 const RE_LAST_IN_HEAD = /<\/head>/;
@@ -8,11 +9,11 @@ function helmet(content, helmetData) {
   let result = content;
   const bodyAttributes = helmetData.bodyAttributes.toString();
   if (bodyAttributes) {
-    result = result.replace(RE_BODY_ATTR, `<body ${bodyAttributes}>`);
+    result = safeReplace(result, RE_BODY_ATTR, `<body ${bodyAttributes}>`);
   }
   const htmlAttributes = helmetData.htmlAttributes.toString();
   if (htmlAttributes) {
-    result = result.replace(RE_HTML_ATTR, `<html ${htmlAttributes}>`);
+    result = safeReplace(result, RE_HTML_ATTR, `<html ${htmlAttributes}>`);
   }
   const base = helmetData.base.toString();
   const link = helmetData.link.toString();
@@ -24,7 +25,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 = safeReplace(result, RE_TITLE, title);
   }
   const helmetStr = [
     base,
@@ -37,7 +38,7 @@ function helmet(content, helmetData) {
   ].reduce((pre, cur) => {
     return pre + (cur.length > 0 ? `  ${cur}${EOL}` : "");
   }, "");
-  return result.replace(RE_LAST_IN_HEAD, `${helmetStr}</head>`);
+  return safeReplace(result, RE_LAST_IN_HEAD, `${helmetStr}</head>`);
 }
 export {
   helmet as default

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

@@ -1,10 +1,10 @@
 import { isReact18 } from "../utils";
-import { CSS_CHUNKS_PLACEHOLDER } from "./utils";
+import { CHUNK_CSS_PLACEHOLDER } from "./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>", `${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>", `${CHUNK_CSS_PLACEHOLDER}</head>`);
   }
   if (isReact18() && options.config.mode === "stream") {
     const pipe = await require("./renderToStream").render(options);

package/dist/esm-node/ssr/serverRender/renderToStream/buildTemplate.after.js

@@ -1,5 +1,6 @@
 import { serializeJson } from "@modern-js/runtime-utils/node";
-import { attributesToString } from "../utils";
+import { attributesToString, safeReplace } from "../utils";
+import { SSR_DATA_PLACEHOLDER } from "../constants";
 import { buildTemplate } from "./buildTemplate.share";
 function buildShellAfterTemplate(afterAppTemplate, options) {
   const callbacks = [
@@ -8,7 +9,7 @@ function buildShellAfterTemplate(afterAppTemplate, options) {
   return buildTemplate(afterAppTemplate, callbacks);
   function injectSSRDataScript(template) {
     const ssrDataScript = buildSSRDataScript();
-    return template.replace("<!--<?- SSRDataScript ?>-->", ssrDataScript);
+    return safeReplace(template, SSR_DATA_PLACEHOLDER, ssrDataScript);
     function buildSSRDataScript() {
       const { context: { ssrContext, initialData, __i18nData__ }, renderLevel } = options;
       const { request, enableUnsafeCtx, nonce, tracker } = ssrContext;

package/dist/esm-node/ssr/serverRender/renderToStream/bulidTemplate.before.js

@@ -1,7 +1,8 @@
 import ReactHelmet from "react-helmet";
 import { matchRoutes } from "@modern-js/runtime-utils/router";
 import helmetReplace from "../helmet";
-import { CSS_CHUNKS_PLACEHOLDER } from "../utils";
+import { CHUNK_CSS_PLACEHOLDER } from "../constants";
+import { safeReplace } from "../utils";
 import { HEAD_REG_EXP, buildTemplate } from "./buildTemplate.share";
 function getHeadTemplate(beforeEntryTemplate, context) {
   const callbacks = [
@@ -18,7 +19,7 @@ function getHeadTemplate(beforeEntryTemplate, context) {
   }
   return buildTemplate(headTemplate, callbacks);
   function injectCss(headTemplate2) {
-    return headTemplate2.replace(CSS_CHUNKS_PLACEHOLDER, getCssChunks());
+    return safeReplace(headTemplate2, CHUNK_CSS_PLACEHOLDER, getCssChunks());
     function getCssChunks() {
       const { routeManifest, routerContext, routes } = context;
       if (!routeManifest || !routerContext || !routes) {

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

@@ -1,7 +1,6 @@
 import { createElement } from "react";
 import { run } from "@modern-js/runtime-utils/node";
 import { time } from "@modern-js/runtime-utils/time";
-import { PreRender } from "../../react/prerender";
 import { SSRErrors, SSRTimings } from "../tracker";
 import renderToPipe from "./renderToPipe";
 const render = ({ App, context }) => {
@@ -19,10 +18,6 @@ const render = ({ App, context }) => {
     const { tracker } = ssrContext;
     const pipe = renderToPipe(rootElement, context, {
       onShellReady() {
-        const cacheConfig = PreRender.config();
-        if (cacheConfig) {
-          ssrContext.cacheConfig = cacheConfig;
-        }
         const cost = end();
         tracker.trackTiming(SSRTimings.RENDER_SHELL, cost);
       },

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

@@ -1,21 +1,19 @@
+import { safeReplace } from "../utils";
+import { HTML_PLACEHOLDER, SSR_DATA_PLACEHOLDER, CHUNK_JS_PLACEHOLDER, CHUNK_CSS_PLACEHOLDER } from "../constants";
 function buildHtml(template, callbacks) {
   return callbacks.reduce((tmp, cb) => cb(tmp), template);
 }
 function createReplaceHtml(html) {
-  const HTML_REG = /<!--<\?-\s*html\s*\?>-->/;
-  return (template) => template.replace(HTML_REG, html);
+  return (template) => safeReplace(template, HTML_PLACEHOLDER, html);
 }
 function createReplaceSSRDataScript(data) {
-  const SSR_DATA_REG = /<!--<\?-\s*SSRDataScript\s*\?>-->/;
-  return (template) => template.replace(SSR_DATA_REG, data);
+  return (template) => safeReplace(template, SSR_DATA_PLACEHOLDER, data);
 }
 function createReplaceChunkJs(js) {
-  const CHUNK_JS_REG = /<!--<\?-\s*chunksMap\.js\s*\?>-->/;
-  return (template) => template.replace(CHUNK_JS_REG, js);
+  return (template) => safeReplace(template, CHUNK_JS_PLACEHOLDER, js);
 }
 function createReplaceChunkCss(css) {
-  const CHUNK_CSS_REG = /<!--<\?-\s*chunksMap\.css\s*\?>-->/;
-  return (template) => template.replace(CHUNK_CSS_REG, css);
+  return (template) => safeReplace(template, CHUNK_CSS_PLACEHOLDER, css);
 }
 export {
   buildHtml,

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

@@ -7,17 +7,20 @@ import { serializeErrors } from "../../../router/runtime/utils";
 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 { ROUTER_DATA_JSON_ID, SSR_DATA_JSON_ID } from "../constants";
+import { attributesToString } from "../utils";
 import { SSRErrors, SSRTimings } from "../tracker";
 import { createLoadableCollector } from "./loadable";
 import { createRender } from "./render";
 import { createStyledCollector } from "./styledComponent";
 import { buildHtml, createReplaceChunkCss, createReplaceChunkJs, createReplaceHtml, createReplaceSSRDataScript } from "./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: {
@@ -27,7 +30,7 @@ const buildTemplateData = (context, data, renderLevel, tracker) => {
         pathname: request.pathname,
         host: request.host,
         url: request.url,
-        ...enableUnsafeCtx ? unsafeContext : {}
+        headers
       },
       reporter: {
         sessionId: tracker.sessionId
@@ -36,8 +39,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;
@@ -59,13 +61,13 @@ Entry = class Entry2 {
       loaderData: routerContext.loaderData,
       errors: 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 = buildHtml(this.template, [
       createReplaceChunkCss(this.result.chunksMap.css),
       createReplaceChunkJs(this.result.chunksMap.js),
-      createReplaceHtml(this.result.html || ""),
       createReplaceSSRDataScript(ssrDataScripts),
+      createReplaceHtml(this.result.html || ""),
       ...this.htmlModifiers
     ]);
     const helmetData = ReactHelmet.renderStatic();
@@ -154,7 +156,7 @@ Entry = class Entry2 {
       }
     };
   }
-};
+}
 export {
   Entry as default
 };

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

@@ -1,5 +1,4 @@
 import { run } from "@modern-js/runtime-utils/node";
-import { PreRender } from "../../react/prerender";
 import SSREntry from "./entry";
 const render = ({ App, context, config }) => {
   const ssrContext = context.ssrContext;
@@ -11,10 +10,6 @@ const render = ({ App, context, config }) => {
     });
     entry.metrics.emitCounter("app.visit.count", 1);
     const html = await entry.renderToHtml(context);
-    const cacheConfig = PreRender.config();
-    if (cacheConfig) {
-      context.ssrContext.cacheConfig = cacheConfig;
-    }
     return html;
   });
 };

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

@@ -1,4 +1,9 @@
-import { RenderLevel } from "./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 = {}));
 export {
   RenderLevel
 };

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

@@ -1,14 +1,12 @@
-const CSS_CHUNKS_PLACEHOLDER = "<!--<?- chunksMap.css ?>-->";
-const SSR_DATA_JSON_ID = "__MODERN_SSR_DATA__";
-const ROUTER_DATA_JSON_ID = "__MODERN_ROUTER_DATA__";
 function attributesToString(attributes) {
   return Object.entries(attributes).reduce((str, [key, value]) => {
     return value === void 0 ? str : `${str} ${key}="${value}"`;
   }, "");
 }
+function safeReplace(source, searchValue, replaceValue) {
+  return source.replace(searchValue, () => replaceValue);
+}
 export {
-  CSS_CHUNKS_PLACEHOLDER,
-  ROUTER_DATA_JSON_ID,
-  SSR_DATA_JSON_ID,
-  attributesToString
+  attributesToString,
+  safeReplace
 };

package/dist/types/exports/server.d.ts

@@ -1,4 +1,5 @@
 import { AfterMatchContext, AfterRenderContext, MiddlewareContext, NextFunction } from '@modern-js/types';
+export type { Container, CacheControl, CacheOptionProvider, CacheOption, } from '@modern-js/types';
 export declare const hook: (attacher: ({ addMiddleware, afterMatch, afterRender, }: {
     addMiddleware: (mid: Middleware) => void;
     afterRender: (hook: AfterRenderHook) => void;

package/dist/types/ssr/react/prerender/index.d.ts

@@ -1 +1,5 @@
+/**
+ * @deprecated
+ * The Prerender already has been deprecated, please use [SSR Cache](https://modernjs.dev/guides/advanced-features/ssr.html) instead.
+ */
 export declare const PreRender: any;

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

@@ -0,0 +1,6 @@
+export declare const HTML_PLACEHOLDER = "<!--<?- html ?>-->";
+export declare const SSR_DATA_PLACEHOLDER = "<!--<?- SSRDataScript ?>-->";
+export declare const CHUNK_JS_PLACEHOLDER = "<!--<?- chunksMap.js ?>-->";
+export declare const CHUNK_CSS_PLACEHOLDER = "<!--<?- chunksMap.css ?>-->";
+export declare const SSR_DATA_JSON_ID = "__MODERN_SSR_DATA__";
+export declare const ROUTER_DATA_JSON_ID = "__MODERN_ROUTER_DATA__";

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

@@ -1,6 +1,5 @@
-import { RuntimeContext, ModernSSRReactComponent, SSRPluginConfig, SSRServerContext } from '../types';
+import { RuntimeContext, ModernSSRReactComponent, SSRPluginConfig, SSRServerContext, RenderResult } from '../types';
 import { SSRTracker } from '../tracker';
-import { RenderResult } from './type';
 type EntryOptions = {
     ctx: SSRServerContext;
     App: ModernSSRReactComponent;

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

@@ -1,6 +1,5 @@
 import { ReactElement } from 'react';
-import { SSRPluginConfig } from '../types';
-import { RenderResult } from './type';
+import { SSRPluginConfig, RenderResult } from '../types';
 import type { Collector } from './render';
 declare class LoadableCollector implements Collector {
     private options;

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

@@ -1,6 +1,6 @@
 import { ServerStyleSheet } from 'styled-components';
 import { ReactElement } from 'react';
-import type { RenderResult } from './type';
+import type { RenderResult } from '../types';
 import type { Collector } from './render';
 declare class StyledCollector implements Collector {
     sheet: ServerStyleSheet;