@modern-js/runtime 2.61.0 → 2.62.0

package/dist/cjs/core/server/requestHandler.js

@@ -47,6 +47,7 @@ function createSSRContext(request, options) {
   }
   const ssrConfig = (0, import_utils.getSSRConfigByEntry)(entryName, config.ssr, config.ssrByEntries);
   const ssrMode = (0, import_utils.getSSRMode)(ssrConfig);
+  const inlineScript = (0, import_utils.getSSRInlineScript)(ssrConfig);
   const loaderFailureMode = typeof ssrConfig === "object" ? ssrConfig.loaderFailureMode : void 0;
   return {
     nonce,
@@ -79,6 +80,7 @@ function createSSRContext(request, options) {
     },
     reporter,
     mode: ssrMode,
+    inlineScript,
     onError,
     onTiming,
     loaderFailureMode

package/dist/cjs/core/server/stream/afterTemplate.js

@@ -22,7 +22,8 @@ __export(afterTemplate_exports, {
 });
 module.exports = __toCommonJS(afterTemplate_exports);
 var import_node = require("@modern-js/runtime-utils/node");
-var import_constants = require("../constants");
+var import_constants = require("../../constants");
+var import_constants2 = require("../constants");
 var import_shared = require("../shared");
 var import_utils = require("../utils");
 function buildShellAfterTemplate(afterAppTemplate, options) {
@@ -86,10 +87,13 @@ function createReplaceSSRData(options) {
   const attrsStr = (0, import_utils.attributesToString)({
     nonce
   });
-  const ssrDataScript = `
-    <script${attrsStr}>window._SSR_DATA = ${(0, import_node.serializeJson)(ssrData)}</script>
-    `;
-  return (template) => (0, import_utils.safeReplace)(template, import_constants.SSR_DATA_PLACEHOLDER, ssrDataScript);
+  const inlineScript = (0, import_utils.getSSRInlineScript)(ssrConfig);
+  const useInlineScript = inlineScript !== false;
+  const serializeSSRData = (0, import_node.serializeJson)(ssrData);
+  const ssrDataScript = useInlineScript ? `
+    <script${attrsStr}>window._SSR_DATA = ${serializeSSRData}</script>
+    ` : `<script type="application/json" id="${import_constants.SSR_DATA_JSON_ID}">${serializeSSRData}</script>`;
+  return (template) => (0, import_utils.safeReplace)(template, import_constants2.SSR_DATA_PLACEHOLDER, ssrDataScript);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/core/server/string/ssrData.js

@@ -79,7 +79,7 @@ function getSSRData() {
 }
 function getSSRDataScripts(ssrData, routerData) {
   const { nonce, ssrConfig } = (0, import_class_private_field_get._)(this, _options);
-  const inlineScript = typeof ssrConfig === "boolean" ? true : (ssrConfig === null || ssrConfig === void 0 ? void 0 : ssrConfig.inlineScript) !== false;
+  const inlineScript = (0, import_utils.getSSRInlineScript)(ssrConfig);
   const useInlineScript = inlineScript !== false;
   const serializeSSRData = (0, import_node.serializeJson)(ssrData);
   const attrsStr = (0, import_utils.attributesToString)({

package/dist/cjs/core/server/utils.js

@@ -21,6 +21,7 @@ __export(utils_exports, {
   attributesToString: () => attributesToString,
   checkIsNode: () => checkIsNode,
   getSSRConfigByEntry: () => getSSRConfigByEntry,
+  getSSRInlineScript: () => getSSRInlineScript,
   getSSRMode: () => getSSRMode,
   safeReplace: () => safeReplace,
   serializeErrors: () => serializeErrors
@@ -75,11 +76,18 @@ function getSSRMode(ssrConfig) {
   }
   return (ssrConfig === null || ssrConfig === void 0 ? void 0 : ssrConfig.mode) === "stream" ? "stream" : "string";
 }
+function getSSRInlineScript(ssrConfig) {
+  if (typeof ssrConfig === "object") {
+    return ssrConfig.inlineScript === void 0 ? true : ssrConfig.inlineScript;
+  }
+  return true;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   attributesToString,
   checkIsNode,
   getSSRConfigByEntry,
+  getSSRInlineScript,
   getSSRMode,
   safeReplace,
   serializeErrors

package/dist/cjs/document/Script.js

@@ -22,14 +22,20 @@ __export(Script_exports, {
 });
 module.exports = __toCommonJS(Script_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
+var import_server = require("react-dom/server");
 var import_constants = require("./constants");
 function Script(props) {
-  const { content } = props;
-  const contentStr = content.toString();
-  const contentIIFE = encodeURIComponent(`(${contentStr})()`);
+  const { content, ...rests } = props;
+  const contentStr = content === null || content === void 0 ? void 0 : content.toString();
+  const contentIIFE = (contentStr === null || contentStr === void 0 ? void 0 : contentStr.length) ? encodeURIComponent(`(${contentStr})()`) : "";
+  const scriptProperties = (0, import_server.renderToString)(/* @__PURE__ */ (0, import_jsx_runtime.jsx)("script", {
+    ...rests
+  }));
+  const scriptpPropertiesStr = encodeURIComponent(scriptProperties.replace("<script ", "").replace("></script>", ""));
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, {
     children: [
       `${import_constants.DOCUMENT_SCRIPT_PLACEHOLDER_START}`,
+      `${import_constants.DOCUMENT_SCRIPT_ATTRIBUTES_START}${scriptpPropertiesStr}${import_constants.DOCUMENT_SCRIPT_ATTRIBUTES_END}`,
       `${contentIIFE}`,
       `${import_constants.DOCUMENT_SCRIPT_PLACEHOLDER_END}`
     ]

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

@@ -169,9 +169,9 @@ const documentPlugin = () => ({
         ].join("");
         const titles = htmlWebpackPlugin.tags.headTags.filter((item) => item.tagName === "title").join("").replace("<title>", "").replace("</title>", "") || templateParameters.title;
         if (html.includes(import_constants.DOCUMENT_SCRIPT_PLACEHOLDER_START) && html.includes(import_constants.DOCUMENT_SCRIPT_PLACEHOLDER_END)) {
-          const { nonce } = config.security;
+          const { nonce } = config.security || {};
           const nonceAttr = nonce ? `nonce=${nonce}` : "";
-          html = html.replace(new RegExp(`${import_constants.DOCUMENT_SCRIPT_PLACEHOLDER_START}(.*?)${import_constants.DOCUMENT_SCRIPT_PLACEHOLDER_END}`, "g"), (_scriptStr, $1) => `<script ${nonceAttr}>${decodeURIComponent($1)}</script>`);
+          html = html.replace(new RegExp(`${import_constants.DOCUMENT_SCRIPT_PLACEHOLDER_START}${import_constants.DOCUMENT_SCRIPT_ATTRIBUTES_START}(.*)${import_constants.DOCUMENT_SCRIPT_ATTRIBUTES_END}(.*?)${import_constants.DOCUMENT_SCRIPT_PLACEHOLDER_END}`, "g"), (_scriptStr, $1, $2) => `<script ${decodeURIComponent($1)} ${nonceAttr}>${decodeURIComponent($2)}</script>`);
         }
         if (html.includes(import_constants.DOCUMENT_STYLE_PLACEHOLDER_START) && html.includes(import_constants.DOCUMENT_STYLE_PLACEHOLDER_END)) {
           html = html.replace(new RegExp(`${import_constants.DOCUMENT_STYLE_PLACEHOLDER_START}(.*?)${import_constants.DOCUMENT_STYLE_PLACEHOLDER_END}`, "g"), (_styleStr, $1) => `<style>${decodeURIComponent($1)}</style>`);

package/dist/cjs/document/constants.js

@@ -26,6 +26,8 @@ __export(constants_exports, {
   DOCUMENT_LINKS_PLACEHOLDER: () => DOCUMENT_LINKS_PLACEHOLDER,
   DOCUMENT_META_PLACEHOLDER: () => DOCUMENT_META_PLACEHOLDER,
   DOCUMENT_SCRIPTS_PLACEHOLDER: () => DOCUMENT_SCRIPTS_PLACEHOLDER,
+  DOCUMENT_SCRIPT_ATTRIBUTES_END: () => DOCUMENT_SCRIPT_ATTRIBUTES_END,
+  DOCUMENT_SCRIPT_ATTRIBUTES_START: () => DOCUMENT_SCRIPT_ATTRIBUTES_START,
   DOCUMENT_SCRIPT_PLACEHOLDER_END: () => DOCUMENT_SCRIPT_PLACEHOLDER_END,
   DOCUMENT_SCRIPT_PLACEHOLDER_START: () => DOCUMENT_SCRIPT_PLACEHOLDER_START,
   DOCUMENT_SSRDATASCRIPT_PLACEHOLDER: () => DOCUMENT_SSRDATASCRIPT_PLACEHOLDER,
@@ -63,6 +65,8 @@ const DOCUMENT_SCRIPTS_PLACEHOLDER = encodeURIComponent("<!-- chunk scripts plac
 const DOCUMENT_LINKS_PLACEHOLDER = encodeURIComponent("<!-- chunk links placeholder -->");
 const DOCUMENT_SCRIPT_PLACEHOLDER_START = encodeURIComponent("<!-- script-start -->");
 const DOCUMENT_SCRIPT_PLACEHOLDER_END = encodeURIComponent("<!-- script-end -->");
+const DOCUMENT_SCRIPT_ATTRIBUTES_START = encodeURIComponent("<!-- script-scriptpProperties-start -->");
+const DOCUMENT_SCRIPT_ATTRIBUTES_END = encodeURIComponent("<!-- script-scriptpProperties-end -->");
 const DOCUMENT_STYLE_PLACEHOLDER_START = encodeURIComponent("<!-- style-start -->");
 const DOCUMENT_STYLE_PLACEHOLDER_END = encodeURIComponent("<!-- style-end -->");
 const DOCUMENT_COMMENT_PLACEHOLDER_START = encodeURIComponent("<!-- comment-start -->");
@@ -82,6 +86,8 @@ const PLACEHOLDER_REPLACER_MAP = {
   DOCUMENT_LINKS_PLACEHOLDER,
   DOCUMENT_META_PLACEHOLDER,
   DOCUMENT_SCRIPTS_PLACEHOLDER,
+  DOCUMENT_SCRIPT_ATTRIBUTES_END,
+  DOCUMENT_SCRIPT_ATTRIBUTES_START,
   DOCUMENT_SCRIPT_PLACEHOLDER_END,
   DOCUMENT_SCRIPT_PLACEHOLDER_START,
   DOCUMENT_SSRDATASCRIPT_PLACEHOLDER,

package/dist/cjs/router/runtime/DeferredDataScripts.node.js

@@ -25,10 +25,12 @@ var import_jsx_runtime = require("react/jsx-runtime");
 var import_node = require("@modern-js/runtime-utils/node");
 var import_router = require("@modern-js/runtime-utils/router");
 var import_react = require("react");
-var import_constants = require("./constants");
+var import_constants = require("../../core/constants");
+var import_constants2 = require("./constants");
 var import_utils = require("./utils");
 const DeferredDataScripts = (props) => {
   const staticContext = props === null || props === void 0 ? void 0 : props.context;
+  const inlineScript = props === null || props === void 0 ? void 0 : props.inlineScript;
   const hydratedRef = (0, import_react.useRef)(false);
   (0, import_react.useEffect)(() => {
     hydratedRef.current = true;
@@ -42,13 +44,11 @@ const DeferredDataScripts = (props) => {
       loaderData: staticContext.loaderData,
       errors: (0, import_utils.serializeErrors)(staticContext.errors)
     };
-    const initialScript0 = `_ROUTER_DATA = ${(0, import_node.serializeJson)(_ROUTER_DATA)};`;
-    const initialScript1 = [
-      `_ROUTER_DATA.s = ${import_constants.setupFnStr}`,
-      `_ROUTER_DATA.r = ${import_constants.resolveFnStr}`,
-      `_ROUTER_DATA.p = ${import_constants.preResolvedFnStr}`,
-      import_constants.mergeLoaderDataStr
-    ].join("\n");
+    const initialScript0 = inlineScript ? "" : `${(0, import_node.serializeJson)(_ROUTER_DATA)}`;
+    const initialScript1 = inlineScript ? [
+      `_ROUTER_DATA = ${(0, import_node.serializeJson)(_ROUTER_DATA)};`,
+      import_constants2.modernInline
+    ].join("\n") : import_constants2.modernInline;
     const deferredDataScripts = [];
     const initialScripts = Object.entries(activeDeferreds).map(([routeId, deferredData]) => {
       const pendingKeys = new Set(deferredData.pendingKeys);
@@ -100,10 +100,12 @@ const DeferredDataScripts = (props) => {
       });
       return {
         fnName: `mergeLoaderData`,
+        fnRun: import_constants2.runWindowFnStr,
         fnArgs: [
           routeId,
           deferredKeyPromiseManifests
-        ]
+        ],
+        fnScriptSrc: "modern-run-window-fn"
       };
     });
     return [
@@ -120,8 +122,9 @@ const DeferredDataScripts = (props) => {
     children: [
       !hydratedRef.current && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, {
         children: [
-          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("script", {
-            async: true,
+          deferredScripts[0].length !== 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("script", {
+            type: "application/json",
+            id: import_constants.ROUTER_DATA_JSON_ID,
             nonce: props === null || props === void 0 ? void 0 : props.nonce,
             suppressHydrationWarning: true,
             dangerouslySetInnerHTML: {
@@ -131,17 +134,21 @@ const DeferredDataScripts = (props) => {
           /* @__PURE__ */ (0, import_jsx_runtime.jsx)("script", {
             async: true,
             nonce: props === null || props === void 0 ? void 0 : props.nonce,
+            "data-script-src": "modern-inline",
             suppressHydrationWarning: true,
             dangerouslySetInnerHTML: {
               __html: deferredScripts[1]
             }
           }),
-          deferredScripts[2].map(({ fnName, fnArgs }) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("script", {
+          deferredScripts[2].map(({ fnName, fnArgs, fnRun, fnScriptSrc }) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("script", {
             async: true,
+            "data-script-src": fnScriptSrc,
+            "data-fn-name": fnName,
+            "data-fn-args": JSON.stringify(fnArgs),
             nonce: props === null || props === void 0 ? void 0 : props.nonce,
             suppressHydrationWarning: true,
             dangerouslySetInnerHTML: {
-              __html: `${fnName}(${fnArgs.map((argv) => `${JSON.stringify(argv)}`).join(",")})`
+              __html: fnRun
             }
           }, fnName))
         ]
@@ -162,9 +169,16 @@ const DeferredDataScript = ({ data, routeId, dataKey, nonce }) => {
       children: (data2) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("script", {
         async: true,
         nonce,
+        "data-fn-name": "r",
+        "data-script-src": "modern-run-router-data-fn",
+        "data-fn-args": `${JSON.stringify([
+          routeId,
+          dataKey,
+          data2
+        ])}`,
         suppressHydrationWarning: true,
         dangerouslySetInnerHTML: {
-          __html: `_ROUTER_DATA.r(${JSON.stringify(routeId)}, ${JSON.stringify(dataKey)}, ${(0, import_node.serializeJson)(data2)});`
+          __html: import_constants2.runRouterDataFnStr
         }
       })
     }) : null
@@ -173,13 +187,21 @@ const DeferredDataScript = ({ data, routeId, dataKey, nonce }) => {
 const ErrorDeferredDataScript = ({ routeId, dataKey, nonce }) => {
   const error = (0, import_router.useAsyncError)();
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("script", {
+    "data-fn-name": "r",
+    "data-script-src": "modern-run-router-data-fn",
+    "data-fn-args": `${JSON.stringify([
+      routeId,
+      dataKey,
+      void 0,
+      {
+        message: error.message,
+        stack: error.stack
+      }
+    ])}`,
     nonce,
     suppressHydrationWarning: true,
     dangerouslySetInnerHTML: {
-      __html: `_ROUTER_DATA.r(${JSON.stringify(routeId)}, ${JSON.stringify(dataKey)}, ${void 0}, ${(0, import_node.serializeJson)({
-        message: error.message,
-        stack: error.stack
-      })});`
+      __html: import_constants2.runRouterDataFnStr
     }
   });
 };

package/dist/cjs/router/runtime/constants.js

@@ -18,20 +18,33 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var constants_exports = {};
 __export(constants_exports, {
+  initRouterDataAttrs: () => initRouterDataAttrs,
   mergeLoaderDataStr: () => mergeLoaderDataStr,
+  modernInline: () => modernInline,
   preResolvedFnStr: () => preResolvedFnStr,
   resolveFnStr: () => resolveFnStr,
+  runRouterDataFnStr: () => runRouterDataFnStr,
+  runWindowFnStr: () => runWindowFnStr,
   setupFnStr: () => setupFnStr
 });
 module.exports = __toCommonJS(constants_exports);
+var import_constants = require("../../core/constants");
 const setupFnStr = `function s(r,e){_ROUTER_DATA.r=_ROUTER_DATA.r||{},_ROUTER_DATA.r[r]=_ROUTER_DATA.r[r]||{};return new Promise((function(A,R){_ROUTER_DATA.r[r][e]={resolve:A,reject:R}}))};`;
 const resolveFnStr = `function r(e,r,o,A){A?_ROUTER_DATA.r[e][r].reject(A):_ROUTER_DATA.r[e][r].resolve(o)};`;
 const preResolvedFnStr = `function p(e,r){return void 0!==r?Promise.reject(new Error(r.message)):Promise.resolve(e)};`;
 const mergeLoaderDataStr = `function mergeLoaderData(e,n){const r=n.reduce((function(e,{key:n,routerDataFnName:r,routerDataFnArgs:a}){const t=a.map((e=>{if("undefined"!==e&&null!==e)return JSON.parse(e)}));return console.info("args",t),{...e,[n]:_ROUTER_DATA[r](...t)}}),{});Object.assign(_ROUTER_DATA.loaderData[e],r)}`;
+const initRouterDataAttrs = `_ROUTER_DATA.s = ${setupFnStr}_ROUTER_DATA.r = ${resolveFnStr}_ROUTER_DATA.p = ${preResolvedFnStr}${mergeLoaderDataStr}`;
+const modernInline = `function runWindowFn(){window[document.currentScript.getAttribute("data-fn-name")](...JSON.parse(document.currentScript.getAttribute("data-fn-args")))}function runRouterDataFn(){_ROUTER_DATA[document.currentScript.getAttribute("data-fn-name")](...JSON.parse(document.currentScript.getAttribute("data-fn-args")))}function initRouterData(e){var r=document.getElementById(e);if(r)try{_ROUTER_DATA=JSON.parse(r.textContent)}catch(r){console.error("parse ".concat(e," error"),t),_ROUTER_DATA={}}};initRouterData('${import_constants.ROUTER_DATA_JSON_ID}');${initRouterDataAttrs}`;
+const runRouterDataFnStr = `runRouterDataFn();`;
+const runWindowFnStr = `runWindowFn();`;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  initRouterDataAttrs,
   mergeLoaderDataStr,
+  modernInline,
   preResolvedFnStr,
   resolveFnStr,
+  runRouterDataFnStr,
+  runWindowFnStr,
   setupFnStr
 });

package/dist/cjs/router/runtime/plugin.js

@@ -119,13 +119,6 @@ const routerPlugin = (userConfig = {}) => {
                   };
                   return originSubscribe(wrapedListener);
                 };
-                Object.defineProperty(runtimeContext, "remixRouter", {
-                  get() {
-                    return router;
-                  },
-                  configurable: true,
-                  enumerable: true
-                });
                 return router;
               }, [
                 finalRouteConfig,

package/dist/cjs/router/runtime/plugin.node.js

@@ -114,8 +114,8 @@ const routerPlugin = (userConfig = {}) => {
             throw routerContext.errors[0];
           }
           const router = (0, import_router.createStaticRouter)(routes, routerContext);
-          context.remixRouter = router;
           context.routerContext = routerContext;
+          context.remixRouter = router;
           context.routes = routes;
         },
         wrapRoot: (App) => {
@@ -126,7 +126,7 @@ const routerPlugin = (userConfig = {}) => {
             return () => {
               const context = (0, import_react.useContext)(import_core.RuntimeReactContext);
               const { remixRouter, routerContext, ssrContext } = context;
-              const { nonce, mode } = ssrContext;
+              const { nonce, mode, inlineScript } = ssrContext;
               const routerWrapper = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, {
                 children: [
                   /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_router.StaticRouterProvider, {
@@ -138,7 +138,8 @@ const routerPlugin = (userConfig = {}) => {
                   // So we can inject it only when streaming ssr
                   /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_DeferredDataScripts.default, {
                     nonce,
-                    context: routerContext
+                    context: routerContext,
+                    inlineScript
                   }),
                   mode === "stream" && import_common.JSX_SHELL_STREAM_END_MARK
                 ]

package/dist/esm/core/server/requestHandler.js

@@ -12,7 +12,7 @@ import { createLoaderManager } from "../loader/loaderManager";
 import { getGlobalRunner } from "../plugin/runner";
 import { createRoot } from "../react";
 import { CHUNK_CSS_PLACEHOLDER } from "./constants";
-import { getSSRConfigByEntry, getSSRMode } from "./utils";
+import { getSSRConfigByEntry, getSSRInlineScript, getSSRMode } from "./utils";
 function createSSRContext(request, options) {
   var config = options.config, loaderContext = options.loaderContext, onError = options.onError, onTiming = options.onTiming, locals = options.locals, resource = options.resource, params = options.params, responseProxy = options.responseProxy, logger = options.logger, metrics = options.metrics, reporter = options.reporter;
   var nonce = config.nonce;
@@ -31,6 +31,7 @@ function createSSRContext(request, options) {
   }
   var ssrConfig = getSSRConfigByEntry(entryName, config.ssr, config.ssrByEntries);
   var ssrMode = getSSRMode(ssrConfig);
+  var inlineScript = getSSRInlineScript(ssrConfig);
   var loaderFailureMode = (typeof ssrConfig === "undefined" ? "undefined" : _type_of(ssrConfig)) === "object" ? ssrConfig.loaderFailureMode : void 0;
   return {
     nonce,
@@ -63,6 +64,7 @@ function createSSRContext(request, options) {
     },
     reporter,
     mode: ssrMode,
+    inlineScript,
     onError,
     onTiming,
     loaderFailureMode

package/dist/esm/core/server/stream/afterTemplate.js

@@ -3,9 +3,10 @@ import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _type_of } from "@swc/helpers/_/_type_of";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { serializeJson } from "@modern-js/runtime-utils/node";
+import { SSR_DATA_JSON_ID } from "../../constants";
 import { SSR_DATA_PLACEHOLDER } from "../constants";
 import { buildHtml } from "../shared";
-import { attributesToString, safeReplace } from "../utils";
+import { attributesToString, getSSRInlineScript, safeReplace } from "../utils";
 function buildShellAfterTemplate(afterAppTemplate, options) {
   var request = options.request, config = options.config, ssrConfig = options.ssrConfig, runtimeContext = options.runtimeContext, renderLevel = options.renderLevel, entryName = options.entryName;
   var callbacks = [
@@ -89,7 +90,10 @@ function createReplaceSSRData(options) {
   var attrsStr = attributesToString({
     nonce
   });
-  var ssrDataScript = "\n    <script".concat(attrsStr, ">window._SSR_DATA = ").concat(serializeJson(ssrData), "</script>\n    ");
+  var inlineScript = getSSRInlineScript(ssrConfig);
+  var useInlineScript = inlineScript !== false;
+  var serializeSSRData = serializeJson(ssrData);
+  var ssrDataScript = useInlineScript ? "\n    <script".concat(attrsStr, ">window._SSR_DATA = ").concat(serializeSSRData, "</script>\n    ") : '<script type="application/json" id="'.concat(SSR_DATA_JSON_ID, '">').concat(serializeSSRData, "</script>");
   return function(template) {
     return safeReplace(template, SSR_DATA_PLACEHOLDER, ssrDataScript);
   };

package/dist/esm/core/server/string/ssrData.js

@@ -8,7 +8,7 @@ import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _type_of } from "@swc/helpers/_/_type_of";
 import { serializeJson } from "@modern-js/runtime-utils/node";
 import { ROUTER_DATA_JSON_ID, SSR_DATA_JSON_ID } from "../../constants";
-import { attributesToString, serializeErrors } from "../utils";
+import { attributesToString, getSSRInlineScript, serializeErrors } from "../utils";
 var _options = /* @__PURE__ */ new WeakMap(), _getSSRData = /* @__PURE__ */ new WeakSet(), _getSSRDataScripts = /* @__PURE__ */ new WeakSet();
 var SSRDataCollector = /* @__PURE__ */ function() {
   "use strict";
@@ -66,7 +66,7 @@ function getSSRData() {
 }
 function getSSRDataScripts(ssrData, routerData) {
   var _$_class_private_field_get = _class_private_field_get(this, _options), nonce = _$_class_private_field_get.nonce, ssrConfig = _$_class_private_field_get.ssrConfig;
-  var inlineScript = typeof ssrConfig === "boolean" ? true : (ssrConfig === null || ssrConfig === void 0 ? void 0 : ssrConfig.inlineScript) !== false;
+  var inlineScript = getSSRInlineScript(ssrConfig);
   var useInlineScript = inlineScript !== false;
   var serializeSSRData = serializeJson(ssrData);
   var attrsStr = attributesToString({

package/dist/esm/core/server/utils.js

@@ -2,6 +2,7 @@ import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
+import { _ as _type_of } from "@swc/helpers/_/_type_of";
 import { isRouteErrorResponse } from "@modern-js/runtime-utils/remix-router";
 function attributesToString(attributes) {
   return Object.entries(attributes).reduce(function(str, param) {
@@ -70,10 +71,17 @@ function getSSRMode(ssrConfig) {
   }
   return (ssrConfig === null || ssrConfig === void 0 ? void 0 : ssrConfig.mode) === "stream" ? "stream" : "string";
 }
+function getSSRInlineScript(ssrConfig) {
+  if ((typeof ssrConfig === "undefined" ? "undefined" : _type_of(ssrConfig)) === "object") {
+    return ssrConfig.inlineScript === void 0 ? true : ssrConfig.inlineScript;
+  }
+  return true;
+}
 export {
   attributesToString,
   checkIsNode,
   getSSRConfigByEntry,
+  getSSRInlineScript,
   getSSRMode,
   safeReplace,
   serializeErrors

package/dist/esm/document/Script.js

@@ -1,12 +1,20 @@
-import { jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { DOCUMENT_SCRIPT_PLACEHOLDER_END, DOCUMENT_SCRIPT_PLACEHOLDER_START } from "./constants";
+import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
+import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { renderToString } from "react-dom/server";
+import { DOCUMENT_SCRIPT_ATTRIBUTES_END, DOCUMENT_SCRIPT_ATTRIBUTES_START, DOCUMENT_SCRIPT_PLACEHOLDER_END, DOCUMENT_SCRIPT_PLACEHOLDER_START } from "./constants";
 function Script(props) {
-  var content = props.content;
-  var contentStr = content.toString();
-  var contentIIFE = encodeURIComponent("(".concat(contentStr, ")()"));
+  var content = props.content, rests = _object_without_properties(props, [
+    "content"
+  ]);
+  var contentStr = content === null || content === void 0 ? void 0 : content.toString();
+  var contentIIFE = (contentStr === null || contentStr === void 0 ? void 0 : contentStr.length) ? encodeURIComponent("(".concat(contentStr, ")()")) : "";
+  var scriptProperties = renderToString(/* @__PURE__ */ _jsx("script", _object_spread({}, rests)));
+  var scriptpPropertiesStr = encodeURIComponent(scriptProperties.replace("<script ", "").replace("></script>", ""));
   return /* @__PURE__ */ _jsxs(_Fragment, {
     children: [
       "".concat(DOCUMENT_SCRIPT_PLACEHOLDER_START),
+      "".concat(DOCUMENT_SCRIPT_ATTRIBUTES_START).concat(scriptpPropertiesStr).concat(DOCUMENT_SCRIPT_ATTRIBUTES_END),
       "".concat(contentIIFE),
       "".concat(DOCUMENT_SCRIPT_PLACEHOLDER_END)
     ]

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

@@ -8,7 +8,7 @@ import { build } from "esbuild";
 import React from "react";
 import ReactDomServer from "react-dom/server";
 import { DocumentContext } from "../DocumentContext";
-import { BODY_PARTICALS_SEPARATOR, DOCUMENT_CHUNKSMAP_PLACEHOLDER, DOCUMENT_COMMENT_PLACEHOLDER_END, DOCUMENT_COMMENT_PLACEHOLDER_START, DOCUMENT_FILE_NAME, DOCUMENT_LINKS_PLACEHOLDER, DOCUMENT_META_PLACEHOLDER, DOCUMENT_SCRIPTS_PLACEHOLDER, DOCUMENT_SCRIPT_PLACEHOLDER_END, DOCUMENT_SCRIPT_PLACEHOLDER_START, DOCUMENT_SSRDATASCRIPT_PLACEHOLDER, DOCUMENT_SSR_PLACEHOLDER, DOCUMENT_STYLE_PLACEHOLDER_END, DOCUMENT_STYLE_PLACEHOLDER_START, DOCUMENT_TITLE_PLACEHOLDER, DOC_EXT, HEAD_PARTICALS_SEPARATOR, HTML_SEPARATOR, PLACEHOLDER_REPLACER_MAP, TOP_PARTICALS_SEPARATOR } from "../constants";
+import { BODY_PARTICALS_SEPARATOR, DOCUMENT_CHUNKSMAP_PLACEHOLDER, DOCUMENT_COMMENT_PLACEHOLDER_END, DOCUMENT_COMMENT_PLACEHOLDER_START, DOCUMENT_FILE_NAME, DOCUMENT_LINKS_PLACEHOLDER, DOCUMENT_META_PLACEHOLDER, DOCUMENT_SCRIPTS_PLACEHOLDER, DOCUMENT_SCRIPT_ATTRIBUTES_END, DOCUMENT_SCRIPT_ATTRIBUTES_START, DOCUMENT_SCRIPT_PLACEHOLDER_END, DOCUMENT_SCRIPT_PLACEHOLDER_START, DOCUMENT_SSRDATASCRIPT_PLACEHOLDER, DOCUMENT_SSR_PLACEHOLDER, DOCUMENT_STYLE_PLACEHOLDER_END, DOCUMENT_STYLE_PLACEHOLDER_START, DOCUMENT_TITLE_PLACEHOLDER, DOC_EXT, HEAD_PARTICALS_SEPARATOR, HTML_SEPARATOR, PLACEHOLDER_REPLACER_MAP, TOP_PARTICALS_SEPARATOR } from "../constants";
 var debug = createDebugger("html_genarate");
 var getDocumenByEntryName = function getDocumenByEntryName2(entrypoints, entryName, fallbackDir) {
   var _entrypoints_find;
@@ -189,10 +189,10 @@ var documentPlugin = function() {
                         return item.tagName === "title";
                       }).join("").replace("<title>", "").replace("</title>", "") || templateParameters.title;
                       if (html.includes(DOCUMENT_SCRIPT_PLACEHOLDER_START) && html.includes(DOCUMENT_SCRIPT_PLACEHOLDER_END)) {
-                        nonce = config.security.nonce;
+                        nonce = (config.security || {}).nonce;
                         nonceAttr = nonce ? "nonce=".concat(nonce) : "";
-                        html = html.replace(new RegExp("".concat(DOCUMENT_SCRIPT_PLACEHOLDER_START, "(.*?)").concat(DOCUMENT_SCRIPT_PLACEHOLDER_END), "g"), function(_scriptStr, $1) {
-                          return "<script ".concat(nonceAttr, ">").concat(decodeURIComponent($1), "</script>");
+                        html = html.replace(new RegExp("".concat(DOCUMENT_SCRIPT_PLACEHOLDER_START).concat(DOCUMENT_SCRIPT_ATTRIBUTES_START, "(.*)").concat(DOCUMENT_SCRIPT_ATTRIBUTES_END, "(.*?)").concat(DOCUMENT_SCRIPT_PLACEHOLDER_END), "g"), function(_scriptStr, $1, $2) {
+                          return "<script ".concat(decodeURIComponent($1), " ").concat(nonceAttr, ">").concat(decodeURIComponent($2), "</script>");
                         });
                       }
                       if (html.includes(DOCUMENT_STYLE_PLACEHOLDER_START) && html.includes(DOCUMENT_STYLE_PLACEHOLDER_END)) {

package/dist/esm/document/constants.js

@@ -21,6 +21,8 @@ var DOCUMENT_SCRIPTS_PLACEHOLDER = encodeURIComponent("<!-- chunk scripts placeh
 var DOCUMENT_LINKS_PLACEHOLDER = encodeURIComponent("<!-- chunk links placeholder -->");
 var DOCUMENT_SCRIPT_PLACEHOLDER_START = encodeURIComponent("<!-- script-start -->");
 var DOCUMENT_SCRIPT_PLACEHOLDER_END = encodeURIComponent("<!-- script-end -->");
+var DOCUMENT_SCRIPT_ATTRIBUTES_START = encodeURIComponent("<!-- script-scriptpProperties-start -->");
+var DOCUMENT_SCRIPT_ATTRIBUTES_END = encodeURIComponent("<!-- script-scriptpProperties-end -->");
 var DOCUMENT_STYLE_PLACEHOLDER_START = encodeURIComponent("<!-- style-start -->");
 var DOCUMENT_STYLE_PLACEHOLDER_END = encodeURIComponent("<!-- style-end -->");
 var DOCUMENT_COMMENT_PLACEHOLDER_START = encodeURIComponent("<!-- comment-start -->");
@@ -36,6 +38,8 @@ export {
   DOCUMENT_LINKS_PLACEHOLDER,
   DOCUMENT_META_PLACEHOLDER,
   DOCUMENT_SCRIPTS_PLACEHOLDER,
+  DOCUMENT_SCRIPT_ATTRIBUTES_END,
+  DOCUMENT_SCRIPT_ATTRIBUTES_START,
   DOCUMENT_SCRIPT_PLACEHOLDER_END,
   DOCUMENT_SCRIPT_PLACEHOLDER_START,
   DOCUMENT_SSRDATASCRIPT_PLACEHOLDER,