@modern-js/runtime 2.61.0 → 2.62.0

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

@@ -3,10 +3,12 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import { serializeJson } from "@modern-js/runtime-utils/node";
 import { Await, useAsyncError } from "@modern-js/runtime-utils/router";
 import { Suspense, useEffect, useMemo, useRef } from "react";
-import { mergeLoaderDataStr, preResolvedFnStr, resolveFnStr, setupFnStr } from "./constants";
+import { ROUTER_DATA_JSON_ID } from "../../core/constants";
+import { modernInline, runRouterDataFnStr, runWindowFnStr } from "./constants";
 import { serializeErrors } from "./utils";
 var DeferredDataScripts = function(props) {
   var staticContext = props === null || props === void 0 ? void 0 : props.context;
+  var inlineScript = props === null || props === void 0 ? void 0 : props.inlineScript;
   var hydratedRef = useRef(false);
   useEffect(function() {
     hydratedRef.current = true;
@@ -20,13 +22,11 @@ var DeferredDataScripts = function(props) {
       loaderData: staticContext.loaderData,
       errors: serializeErrors(staticContext.errors)
     };
-    var initialScript0 = "_ROUTER_DATA = ".concat(serializeJson(_ROUTER_DATA), ";");
-    var initialScript1 = [
-      "_ROUTER_DATA.s = ".concat(setupFnStr),
-      "_ROUTER_DATA.r = ".concat(resolveFnStr),
-      "_ROUTER_DATA.p = ".concat(preResolvedFnStr),
-      mergeLoaderDataStr
-    ].join("\n");
+    var initialScript0 = inlineScript ? "" : "".concat(serializeJson(_ROUTER_DATA));
+    var initialScript1 = inlineScript ? [
+      "_ROUTER_DATA = ".concat(serializeJson(_ROUTER_DATA), ";"),
+      modernInline
+    ].join("\n") : modernInline;
     var deferredDataScripts = [];
     var initialScripts = Object.entries(activeDeferreds).map(function(param) {
       var _param = _sliced_to_array(param, 2), routeId = _param[0], deferredData = _param[1];
@@ -79,10 +79,12 @@ var DeferredDataScripts = function(props) {
       });
       return {
         fnName: "mergeLoaderData",
+        fnRun: runWindowFnStr,
         fnArgs: [
           routeId,
           deferredKeyPromiseManifests
-        ]
+        ],
+        fnScriptSrc: "modern-run-window-fn"
       };
     });
     return [
@@ -99,8 +101,9 @@ var DeferredDataScripts = function(props) {
     children: [
       !hydratedRef.current && /* @__PURE__ */ _jsxs(_Fragment, {
         children: [
-          /* @__PURE__ */ _jsx("script", {
-            async: true,
+          deferredScripts[0].length !== 0 && /* @__PURE__ */ _jsx("script", {
+            type: "application/json",
+            id: ROUTER_DATA_JSON_ID,
             nonce: props === null || props === void 0 ? void 0 : props.nonce,
             suppressHydrationWarning: true,
             dangerouslySetInnerHTML: {
@@ -110,21 +113,23 @@ var DeferredDataScripts = function(props) {
           /* @__PURE__ */ _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(function(param) {
-            var fnName = param.fnName, fnArgs = param.fnArgs;
+            var fnName = param.fnName, fnArgs = param.fnArgs, fnRun = param.fnRun, fnScriptSrc = param.fnScriptSrc;
             return /* @__PURE__ */ _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: "".concat(fnName, "(").concat(fnArgs.map(function(argv) {
-                  return "".concat(JSON.stringify(argv));
-                }).join(","), ")")
+                __html: fnRun
               }
             }, fnName);
           })
@@ -148,9 +153,16 @@ var DeferredDataScript = function(param) {
         return /* @__PURE__ */ _jsx("script", {
           async: true,
           nonce,
+          "data-fn-name": "r",
+          "data-script-src": "modern-run-router-data-fn",
+          "data-fn-args": "".concat(JSON.stringify([
+            routeId,
+            dataKey,
+            data2
+          ])),
           suppressHydrationWarning: true,
           dangerouslySetInnerHTML: {
-            __html: "_ROUTER_DATA.r(".concat(JSON.stringify(routeId), ", ").concat(JSON.stringify(dataKey), ", ").concat(serializeJson(data2), ");")
+            __html: runRouterDataFnStr
           }
         });
       }
@@ -161,13 +173,21 @@ var ErrorDeferredDataScript = function(param) {
   var routeId = param.routeId, dataKey = param.dataKey, nonce = param.nonce;
   var error = useAsyncError();
   return /* @__PURE__ */ _jsx("script", {
+    "data-fn-name": "r",
+    "data-script-src": "modern-run-router-data-fn",
+    "data-fn-args": "".concat(JSON.stringify([
+      routeId,
+      dataKey,
+      void 0,
+      {
+        message: error.message,
+        stack: error.stack
+      }
+    ])),
     nonce,
     suppressHydrationWarning: true,
     dangerouslySetInnerHTML: {
-      __html: "_ROUTER_DATA.r(".concat(JSON.stringify(routeId), ", ").concat(JSON.stringify(dataKey), ", ").concat(void 0, ", ").concat(serializeJson({
-        message: error.message,
-        stack: error.stack
-      }), ");")
+      __html: runRouterDataFnStr
     }
   });
 };

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

@@ -1,10 +1,19 @@
+import { ROUTER_DATA_JSON_ID } from "../../core/constants";
 var 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}}))};";
 var resolveFnStr = "function r(e,r,o,A){A?_ROUTER_DATA.r[e][r].reject(A):_ROUTER_DATA.r[e][r].resolve(o)};";
 var preResolvedFnStr = "function p(e,r){return void 0!==r?Promise.reject(new Error(r.message)):Promise.resolve(e)};";
 var 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)}';
+var initRouterDataAttrs = "_ROUTER_DATA.s = ".concat(setupFnStr, "_ROUTER_DATA.r = ").concat(resolveFnStr, "_ROUTER_DATA.p = ").concat(preResolvedFnStr).concat(mergeLoaderDataStr);
+var 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('`.concat(ROUTER_DATA_JSON_ID, "');").concat(initRouterDataAttrs);
+var runRouterDataFnStr = "runRouterDataFn();";
+var runWindowFnStr = "runWindowFn();";
 export {
+  initRouterDataAttrs,
   mergeLoaderDataStr,
+  modernInline,
   preResolvedFnStr,
   resolveFnStr,
+  runRouterDataFnStr,
+  runWindowFnStr,
   setupFnStr
 };

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

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

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

@@ -103,8 +103,8 @@ var routerPlugin = function() {
                     throw routerContext.errors[0];
                   }
                   router = createStaticRouter(routes, routerContext);
-                  context.remixRouter = router;
                   context.routerContext = routerContext;
+                  context.remixRouter = router;
                   context.routes = routes;
                   return [
                     2
@@ -121,7 +121,7 @@ var routerPlugin = function() {
             return function() {
               var context = useContext(RuntimeReactContext);
               var remixRouter = context.remixRouter, routerContext = context.routerContext, ssrContext = context.ssrContext;
-              var nonce = ssrContext.nonce, mode = ssrContext.mode;
+              var nonce = ssrContext.nonce, mode = ssrContext.mode, inlineScript = ssrContext.inlineScript;
               var routerWrapper = /* @__PURE__ */ _jsxs(_Fragment, {
                 children: [
                   /* @__PURE__ */ _jsx(StaticRouterProvider, {
@@ -133,7 +133,8 @@ var routerPlugin = function() {
                   // So we can inject it only when streaming ssr
                   /* @__PURE__ */ _jsx(DeferredDataScripts, {
                     nonce,
-                    context: routerContext
+                    context: routerContext,
+                    inlineScript
                   }),
                   mode === "stream" && JSX_SHELL_STREAM_END_MARK
                 ]

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

@@ -5,7 +5,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) {
   const { config, loaderContext, onError, onTiming, locals, resource, params, responseProxy, logger, metrics, reporter } = options;
   const { nonce } = config;
@@ -24,6 +24,7 @@ function createSSRContext(request, options) {
   }
   const ssrConfig = getSSRConfigByEntry(entryName, config.ssr, config.ssrByEntries);
   const ssrMode = getSSRMode(ssrConfig);
+  const inlineScript = getSSRInlineScript(ssrConfig);
   const loaderFailureMode = typeof ssrConfig === "object" ? ssrConfig.loaderFailureMode : void 0;
   return {
     nonce,
@@ -56,6 +57,7 @@ function createSSRContext(request, options) {
     },
     reporter,
     mode: ssrMode,
+    inlineScript,
     onError,
     onTiming,
     loaderFailureMode

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

@@ -1,7 +1,8 @@
 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) {
   const { request, config, ssrConfig, runtimeContext, renderLevel, entryName } = options;
   const callbacks = [
@@ -63,9 +64,12 @@ function createReplaceSSRData(options) {
   const attrsStr = attributesToString({
     nonce
   });
-  const ssrDataScript = `
-    <script${attrsStr}>window._SSR_DATA = ${serializeJson(ssrData)}</script>
-    `;
+  const inlineScript = getSSRInlineScript(ssrConfig);
+  const useInlineScript = inlineScript !== false;
+  const serializeSSRData = serializeJson(ssrData);
+  const ssrDataScript = useInlineScript ? `
+    <script${attrsStr}>window._SSR_DATA = ${serializeSSRData}</script>
+    ` : `<script type="application/json" id="${SSR_DATA_JSON_ID}">${serializeSSRData}</script>`;
   return (template) => safeReplace(template, SSR_DATA_PLACEHOLDER, ssrDataScript);
 }
 export {

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

@@ -5,7 +5,7 @@ import { _ as _class_private_method_get } from "@swc/helpers/_/_class_private_me
 import { _ as _class_private_method_init } from "@swc/helpers/_/_class_private_method_init";
 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();
 class SSRDataCollector {
   effect() {
@@ -56,7 +56,7 @@ function getSSRData() {
 }
 function getSSRDataScripts(ssrData, routerData) {
   const { nonce, ssrConfig } = _class_private_field_get(this, _options);
-  const inlineScript = typeof ssrConfig === "boolean" ? true : (ssrConfig === null || ssrConfig === void 0 ? void 0 : ssrConfig.inlineScript) !== false;
+  const inlineScript = getSSRInlineScript(ssrConfig);
   const useInlineScript = inlineScript !== false;
   const serializeSSRData = serializeJson(ssrData);
   const attrsStr = attributesToString({

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

@@ -47,10 +47,17 @@ 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;
+}
 export {
   attributesToString,
   checkIsNode,
   getSSRConfigByEntry,
+  getSSRInlineScript,
   getSSRMode,
   safeReplace,
   serializeErrors

package/dist/esm-node/document/Script.js

@@ -1,12 +1,18 @@
-import { jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { DOCUMENT_SCRIPT_PLACEHOLDER_END, DOCUMENT_SCRIPT_PLACEHOLDER_START } from "./constants";
+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) {
-  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 = renderToString(/* @__PURE__ */ _jsx("script", {
+    ...rests
+  }));
+  const scriptpPropertiesStr = encodeURIComponent(scriptProperties.replace("<script ", "").replace("></script>", ""));
   return /* @__PURE__ */ _jsxs(_Fragment, {
     children: [
       `${DOCUMENT_SCRIPT_PLACEHOLDER_START}`,
+      `${DOCUMENT_SCRIPT_ATTRIBUTES_START}${scriptpPropertiesStr}${DOCUMENT_SCRIPT_ATTRIBUTES_END}`,
       `${contentIIFE}`,
       `${DOCUMENT_SCRIPT_PLACEHOLDER_END}`
     ]

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

@@ -4,7 +4,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";
 const debug = createDebugger("html_genarate");
 const getDocumenByEntryName = function(entrypoints, entryName, fallbackDir) {
   var _entrypoints_find;
@@ -134,9 +134,9 @@ const documentPlugin = () => ({
         ].join("");
         const titles = htmlWebpackPlugin.tags.headTags.filter((item) => item.tagName === "title").join("").replace("<title>", "").replace("</title>", "") || templateParameters.title;
         if (html.includes(DOCUMENT_SCRIPT_PLACEHOLDER_START) && html.includes(DOCUMENT_SCRIPT_PLACEHOLDER_END)) {
-          const { nonce } = config.security;
+          const { nonce } = config.security || {};
           const nonceAttr = nonce ? `nonce=${nonce}` : "";
-          html = html.replace(new RegExp(`${DOCUMENT_SCRIPT_PLACEHOLDER_START}(.*?)${DOCUMENT_SCRIPT_PLACEHOLDER_END}`, "g"), (_scriptStr, $1) => `<script ${nonceAttr}>${decodeURIComponent($1)}</script>`);
+          html = html.replace(new RegExp(`${DOCUMENT_SCRIPT_PLACEHOLDER_START}${DOCUMENT_SCRIPT_ATTRIBUTES_START}(.*)${DOCUMENT_SCRIPT_ATTRIBUTES_END}(.*?)${DOCUMENT_SCRIPT_PLACEHOLDER_END}`, "g"), (_scriptStr, $1, $2) => `<script ${decodeURIComponent($1)} ${nonceAttr}>${decodeURIComponent($2)}</script>`);
         }
         if (html.includes(DOCUMENT_STYLE_PLACEHOLDER_START) && html.includes(DOCUMENT_STYLE_PLACEHOLDER_END)) {
           html = html.replace(new RegExp(`${DOCUMENT_STYLE_PLACEHOLDER_START}(.*?)${DOCUMENT_STYLE_PLACEHOLDER_END}`, "g"), (_styleStr, $1) => `<style>${decodeURIComponent($1)}</style>`);

package/dist/esm-node/document/constants.js

@@ -20,6 +20,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 -->");
@@ -38,6 +40,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,

package/dist/esm-node/router/runtime/DeferredDataScripts.node.js

@@ -2,10 +2,12 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import { serializeJson } from "@modern-js/runtime-utils/node";
 import { Await, useAsyncError } from "@modern-js/runtime-utils/router";
 import { Suspense, useEffect, useMemo, useRef } from "react";
-import { mergeLoaderDataStr, preResolvedFnStr, resolveFnStr, setupFnStr } from "./constants";
+import { ROUTER_DATA_JSON_ID } from "../../core/constants";
+import { modernInline, runRouterDataFnStr, runWindowFnStr } from "./constants";
 import { serializeErrors } from "./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 = useRef(false);
   useEffect(() => {
     hydratedRef.current = true;
@@ -19,13 +21,11 @@ const DeferredDataScripts = (props) => {
       loaderData: staticContext.loaderData,
       errors: serializeErrors(staticContext.errors)
     };
-    const initialScript0 = `_ROUTER_DATA = ${serializeJson(_ROUTER_DATA)};`;
-    const initialScript1 = [
-      `_ROUTER_DATA.s = ${setupFnStr}`,
-      `_ROUTER_DATA.r = ${resolveFnStr}`,
-      `_ROUTER_DATA.p = ${preResolvedFnStr}`,
-      mergeLoaderDataStr
-    ].join("\n");
+    const initialScript0 = inlineScript ? "" : `${serializeJson(_ROUTER_DATA)}`;
+    const initialScript1 = inlineScript ? [
+      `_ROUTER_DATA = ${serializeJson(_ROUTER_DATA)};`,
+      modernInline
+    ].join("\n") : modernInline;
     const deferredDataScripts = [];
     const initialScripts = Object.entries(activeDeferreds).map(([routeId, deferredData]) => {
       const pendingKeys = new Set(deferredData.pendingKeys);
@@ -77,10 +77,12 @@ const DeferredDataScripts = (props) => {
       });
       return {
         fnName: `mergeLoaderData`,
+        fnRun: runWindowFnStr,
         fnArgs: [
           routeId,
           deferredKeyPromiseManifests
-        ]
+        ],
+        fnScriptSrc: "modern-run-window-fn"
       };
     });
     return [
@@ -97,8 +99,9 @@ const DeferredDataScripts = (props) => {
     children: [
       !hydratedRef.current && /* @__PURE__ */ _jsxs(_Fragment, {
         children: [
-          /* @__PURE__ */ _jsx("script", {
-            async: true,
+          deferredScripts[0].length !== 0 && /* @__PURE__ */ _jsx("script", {
+            type: "application/json",
+            id: ROUTER_DATA_JSON_ID,
             nonce: props === null || props === void 0 ? void 0 : props.nonce,
             suppressHydrationWarning: true,
             dangerouslySetInnerHTML: {
@@ -108,17 +111,21 @@ const DeferredDataScripts = (props) => {
           /* @__PURE__ */ _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__ */ _jsx("script", {
+          deferredScripts[2].map(({ fnName, fnArgs, fnRun, fnScriptSrc }) => /* @__PURE__ */ _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))
         ]
@@ -139,9 +146,16 @@ const DeferredDataScript = ({ data, routeId, dataKey, nonce }) => {
       children: (data2) => /* @__PURE__ */ _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)}, ${serializeJson(data2)});`
+          __html: runRouterDataFnStr
         }
       })
     }) : null
@@ -150,13 +164,21 @@ const DeferredDataScript = ({ data, routeId, dataKey, nonce }) => {
 const ErrorDeferredDataScript = ({ routeId, dataKey, nonce }) => {
   const error = useAsyncError();
   return /* @__PURE__ */ _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}, ${serializeJson({
-        message: error.message,
-        stack: error.stack
-      })});`
+      __html: runRouterDataFnStr
     }
   });
 };

package/dist/esm-node/router/runtime/constants.js

@@ -1,10 +1,19 @@
+import { ROUTER_DATA_JSON_ID } from "../../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('${ROUTER_DATA_JSON_ID}');${initRouterDataAttrs}`;
+const runRouterDataFnStr = `runRouterDataFn();`;
+const runWindowFnStr = `runWindowFn();`;
 export {
+  initRouterDataAttrs,
   mergeLoaderDataStr,
+  modernInline,
   preResolvedFnStr,
   resolveFnStr,
+  runRouterDataFnStr,
+  runWindowFnStr,
   setupFnStr
 };

package/dist/esm-node/router/runtime/plugin.js

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

package/dist/esm-node/router/runtime/plugin.node.js

@@ -80,8 +80,8 @@ const routerPlugin = (userConfig = {}) => {
             throw routerContext.errors[0];
           }
           const router = createStaticRouter(routes, routerContext);
-          context.remixRouter = router;
           context.routerContext = routerContext;
+          context.remixRouter = router;
           context.routes = routes;
         },
         wrapRoot: (App) => {
@@ -92,7 +92,7 @@ const routerPlugin = (userConfig = {}) => {
             return () => {
               const context = useContext(RuntimeReactContext);
               const { remixRouter, routerContext, ssrContext } = context;
-              const { nonce, mode } = ssrContext;
+              const { nonce, mode, inlineScript } = ssrContext;
               const routerWrapper = /* @__PURE__ */ _jsxs(_Fragment, {
                 children: [
                   /* @__PURE__ */ _jsx(StaticRouterProvider, {
@@ -104,7 +104,8 @@ const routerPlugin = (userConfig = {}) => {
                   // So we can inject it only when streaming ssr
                   /* @__PURE__ */ _jsx(DeferredDataScripts, {
                     nonce,
-                    context: routerContext
+                    context: routerContext,
+                    inlineScript
                   }),
                   mode === "stream" && JSX_SHELL_STREAM_END_MARK
                 ]

package/dist/types/core/context/runtime.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import type { Store } from '@modern-js-reduck/store';
-import type { Router, StaticHandlerContext } from '@modern-js/runtime-utils/remix-router';
+import type { StaticHandlerContext } from '@modern-js/runtime-utils/remix-router';
 import type { RouteManifest } from '../../router/runtime/types';
 import { createLoaderManager } from '../loader/loaderManager';
 import type { PluginRunner, runtime } from '../plugin';
@@ -14,10 +14,6 @@ interface BaseRuntimeContext {
     store?: Store;
     routeManifest: RouteManifest;
     routerContext?: StaticHandlerContext;
-    /**
-     * private method
-     */
-    remixRouter?: Router;
     /**
      * private
      */

package/dist/types/core/server/stream/afterTemplate.d.ts

@@ -1,4 +1,4 @@
-import type { RenderLevel } from '../../constants';
+import { type RenderLevel } from '../../constants';
 import type { RuntimeContext } from '../../context';
 import type { HandleRequestConfig } from '../requestHandler';
 import { type SSRConfig } from '../shared';

package/dist/types/core/server/utils.d.ts

@@ -17,3 +17,4 @@ export declare function checkIsNode(): boolean;
 export declare function serializeErrors(errors: StaticHandlerContext['errors']): StaticHandlerContext['errors'];
 export declare function getSSRConfigByEntry(entryName: string, ssr?: ServerUserConfig['ssr'], ssrByEntries?: ServerUserConfig['ssrByEntries']): import("@modern-js/app-tools").SSR;
 export declare function getSSRMode(ssrConfig?: SSRConfig): 'string' | 'stream' | false;
+export declare function getSSRInlineScript(ssrConfig?: SSRConfig): boolean;

package/dist/types/core/types.d.ts

@@ -52,6 +52,7 @@ export type SSRServerContext = Pick<BaseSSRServerContext, 'redirection' | 'respo
     loaderFailureMode?: 'clientRender' | 'errorBoundary';
     onError?: (e: unknown) => void;
     onTiming?: (name: string, dur: number) => void;
+    inlineScript?: boolean;
 };
 interface TSSRBaseContext {
     request: BaseSSRServerContext['request'] & {

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

@@ -1,4 +1,5 @@
-import React from 'react';
-export declare function Script(props: {
-    content: () => void;
-}): React.JSX.Element;
+/// <reference types="react" />
+export declare function Script(props: DocumentScriptProps): import("react").JSX.Element;
+export interface DocumentScriptProps extends Omit<React.ScriptHTMLAttributes<HTMLScriptElement>, 'content'> {
+    content?: () => void;
+}

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

@@ -14,6 +14,8 @@ export declare const DOCUMENT_SCRIPTS_PLACEHOLDER: string;
 export declare const DOCUMENT_LINKS_PLACEHOLDER: string;
 export declare const DOCUMENT_SCRIPT_PLACEHOLDER_START: string;
 export declare const DOCUMENT_SCRIPT_PLACEHOLDER_END: string;
+export declare const DOCUMENT_SCRIPT_ATTRIBUTES_START: string;
+export declare const DOCUMENT_SCRIPT_ATTRIBUTES_END: string;
 export declare const DOCUMENT_STYLE_PLACEHOLDER_START: string;
 export declare const DOCUMENT_STYLE_PLACEHOLDER_END: string;
 export declare const DOCUMENT_COMMENT_PLACEHOLDER_START: string;

package/dist/types/router/runtime/DeferredDataScripts.node.d.ts

@@ -6,6 +6,7 @@ import type { StaticHandlerContext } from '@modern-js/runtime-utils/remix-router
  */
 declare const DeferredDataScripts: (props?: {
     nonce?: string;
+    inlineScript?: boolean;
     context: StaticHandlerContext;
 }) => import("react").JSX.Element | null;
 export default DeferredDataScripts;