@modern-js/runtime 2.63.0 → 2.63.2

package/dist/cjs/cli/template.js

@@ -89,7 +89,7 @@ const runtimeGlobalContext = ({ srcDirectory, internalSrcAlias, metaName, entry,
   return `import { setGlobalContext } from '@${metaName}/runtime/context'
 
 import App from '${// We need to get the path of App.tsx here, but the entry is `src/entry.tsx`
-  (0, import_utils.formatImportPath)(customEntry ? entry.replace("entry.tsx", "App").replace(srcDirectory, internalSrcAlias) : entry.replace(srcDirectory, internalSrcAlias).replace(".tsx", ""))}';
+  (0, import_utils.formatImportPath)(customEntry ? entry.replace(/entry\.[tj]sx/, "App").replace(srcDirectory, internalSrcAlias) : entry.replace(srcDirectory, internalSrcAlias).replace(/\.[tj]sx/, ""))}';
 
 setGlobalContext({
   App,

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

@@ -31,7 +31,7 @@ var import_constants = require("./constants");
 var import_utils = require("./utils");
 function createSSRContext(request, options) {
   const { config, loaderContext, onError, onTiming, locals, resource, params, responseProxy, logger, metrics, reporter } = options;
-  const { nonce } = config;
+  const { nonce, useJsonScript } = config;
   const { entryName, route } = resource;
   const { headers } = request;
   const cookie = headers.get("cookie") || "";
@@ -47,10 +47,10 @@ 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,
+    useJsonScript,
     loaderContext,
     redirection: {},
     htmlModifiers: [],
@@ -80,7 +80,6 @@ function createSSRContext(request, options) {
     },
     reporter,
     mode: ssrMode,
-    inlineScript,
     onError,
     onTiming,
     loaderFailureMode

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

@@ -33,6 +33,7 @@ function buildShellAfterTemplate(afterAppTemplate, options) {
       request,
       ssrConfig,
       nonce: config.nonce,
+      useJsonScript: config.useJsonScript,
       runtimeContext,
       renderLevel
     }),
@@ -57,7 +58,7 @@ function buildShellAfterTemplate(afterAppTemplate, options) {
   return (0, import_shared.buildHtml)(afterAppTemplate, callbacks);
 }
 function createReplaceSSRData(options) {
-  const { runtimeContext, nonce, renderLevel, ssrConfig } = options;
+  const { runtimeContext, nonce, renderLevel, useJsonScript, ssrConfig } = options;
   const { request, reporter } = runtimeContext.ssrContext;
   const headers = typeof ssrConfig === "object" && ssrConfig.unsafeHeaders ? Object.fromEntries(Object.entries(request.headers).filter(([key, _]) => {
     var _ssrConfig_unsafeHeaders_map, _ssrConfig_unsafeHeaders;
@@ -87,12 +88,8 @@ function createReplaceSSRData(options) {
   const attrsStr = (0, import_utils.attributesToString)({
     nonce
   });
-  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>`;
+  const ssrDataScript = useJsonScript ? `<script type="application/json" id="${import_constants.SSR_DATA_JSON_ID}">${serializeSSRData}</script>` : `<script${attrsStr}>window._SSR_DATA = ${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:

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

@@ -91,7 +91,8 @@ const renderString = async (request, serverRoot, options) => {
         ssrContext: runtimeContext.ssrContext,
         chunkSet,
         routerContext,
-        nonce: config.nonce
+        nonce: config.nonce,
+        useJsonScript: config.useJsonScript
       })
     ];
     const rootElement = (0, import_wrapper.wrapRuntimeContextProvider)(serverRoot, Object.assign(runtimeContext, {

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

@@ -78,19 +78,17 @@ function getSSRData() {
   };
 }
 function getSSRDataScripts(ssrData, routerData) {
-  const { nonce, ssrConfig } = (0, import_class_private_field_get._)(this, _options);
-  const inlineScript = (0, import_utils.getSSRInlineScript)(ssrConfig);
-  const useInlineScript = inlineScript !== false;
+  const { nonce, useJsonScript = false } = (0, import_class_private_field_get._)(this, _options);
   const serializeSSRData = (0, import_node.serializeJson)(ssrData);
   const attrsStr = (0, import_utils.attributesToString)({
     nonce
   });
-  let ssrDataScripts = useInlineScript ? `<script${attrsStr}>window._SSR_DATA = ${serializeSSRData}</script>` : `<script type="application/json" id="${import_constants.SSR_DATA_JSON_ID}">${serializeSSRData}</script>`;
+  let ssrDataScripts = useJsonScript ? `<script type="application/json" id="${import_constants.SSR_DATA_JSON_ID}">${serializeSSRData}</script>` : `<script${attrsStr}>window._SSR_DATA = ${serializeSSRData}</script>`;
   if (routerData) {
     const serializedRouterData = (0, import_node.serializeJson)(routerData);
-    ssrDataScripts += useInlineScript ? `
-<script${attrsStr}>window._ROUTER_DATA = ${serializedRouterData}</script>` : `
-<script type="application/json" id="${import_constants.ROUTER_DATA_JSON_ID}">${serializedRouterData}</script>`;
+    ssrDataScripts += useJsonScript ? `
+<script type="application/json" id="${import_constants.ROUTER_DATA_JSON_ID}">${serializedRouterData}</script>` : `
+<script${attrsStr}>window._ROUTER_DATA = ${serializedRouterData}</script>`;
   }
   return ssrDataScripts;
 }

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

@@ -21,7 +21,6 @@ __export(utils_exports, {
   attributesToString: () => attributesToString,
   checkIsNode: () => checkIsNode,
   getSSRConfigByEntry: () => getSSRConfigByEntry,
-  getSSRInlineScript: () => getSSRInlineScript,
   getSSRMode: () => getSSRMode,
   safeReplace: () => safeReplace,
   serializeErrors: () => serializeErrors
@@ -76,18 +75,11 @@ 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/router/runtime/DeferredDataScripts.node.js

@@ -30,7 +30,7 @@ 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 useJsonScript = props === null || props === void 0 ? void 0 : props.useJsonScript;
   const hydratedRef = (0, import_react.useRef)(false);
   (0, import_react.useEffect)(() => {
     hydratedRef.current = true;
@@ -44,11 +44,11 @@ const DeferredDataScripts = (props) => {
       loaderData: staticContext.loaderData,
       errors: (0, import_utils.serializeErrors)(staticContext.errors)
     };
-    const initialScript0 = inlineScript ? "" : `${(0, import_node.serializeJson)(_ROUTER_DATA)}`;
-    const initialScript1 = inlineScript ? [
+    const initialScript0 = useJsonScript ? `${(0, import_node.serializeJson)(_ROUTER_DATA)}` : "";
+    const initialScript1 = useJsonScript ? import_constants2.modernInline : [
       `_ROUTER_DATA = ${(0, import_node.serializeJson)(_ROUTER_DATA)};`,
       import_constants2.modernInline
-    ].join("\n") : import_constants2.modernInline;
+    ].join("\n");
     const deferredDataScripts = [];
     const initialScripts = Object.entries(activeDeferreds).map(([routeId, deferredData]) => {
       const pendingKeys = new Set(deferredData.pendingKeys);

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

@@ -109,9 +109,11 @@ const routerPlugin = (userConfig = {}) => {
           if (routerContext instanceof Response) {
             return interrupt(routerContext);
           }
-          if (routerContext.statusCode >= 500 && routerContext.statusCode < 600 && loaderFailureMode === "clientRender") {
+          if (routerContext.statusCode >= 500 && routerContext.statusCode < 600 && // TODO: if loaderFailureMode is not 'errroBoundary', error log will not be printed.
+          loaderFailureMode === "clientRender") {
             routerContext.statusCode = 200;
-            throw routerContext.errors[0];
+            const errors = Object.values(routerContext.errors);
+            throw errors[0];
           }
           const router = (0, import_router.createStaticRouter)(routes, routerContext);
           context.routerContext = routerContext;
@@ -126,7 +128,7 @@ const routerPlugin = (userConfig = {}) => {
             return () => {
               const context = (0, import_react.useContext)(import_core.RuntimeReactContext);
               const { remixRouter, routerContext, ssrContext } = context;
-              const { nonce, mode, inlineScript } = ssrContext;
+              const { nonce, mode, useJsonScript } = ssrContext;
               const routerWrapper = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, {
                 children: [
                   /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_router.StaticRouterProvider, {
@@ -139,7 +141,7 @@ const routerPlugin = (userConfig = {}) => {
                   /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_DeferredDataScripts.default, {
                     nonce,
                     context: routerContext,
-                    inlineScript
+                    useJsonScript
                   }),
                   mode === "stream" && import_common.JSX_SHELL_STREAM_END_MARK
                 ]

package/dist/esm/cli/template.js

@@ -44,7 +44,7 @@ var runtimeRegister = function(param) {
 };
 var runtimeGlobalContext = function(param) {
   var srcDirectory = param.srcDirectory, internalSrcAlias = param.internalSrcAlias, metaName = param.metaName, entry = param.entry, customEntry = param.customEntry;
-  return "import { setGlobalContext } from '@".concat(metaName, "/runtime/context'\n\nimport App from '").concat(formatImportPath(customEntry ? entry.replace("entry.tsx", "App").replace(srcDirectory, internalSrcAlias) : entry.replace(srcDirectory, internalSrcAlias).replace(".tsx", "")), "';\n\nsetGlobalContext({\n  App,\n});");
+  return "import { setGlobalContext } from '@".concat(metaName, "/runtime/context'\n\nimport App from '").concat(formatImportPath(customEntry ? entry.replace(/entry\.[tj]sx/, "App").replace(srcDirectory, internalSrcAlias) : entry.replace(srcDirectory, internalSrcAlias).replace(/\.[tj]sx/, "")), "';\n\nsetGlobalContext({\n  App,\n});");
 };
 export {
   index,

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

@@ -12,10 +12,10 @@ import { createLoaderManager } from "../loader/loaderManager";
 import { getGlobalRunner } from "../plugin/runner";
 import { createRoot } from "../react";
 import { CHUNK_CSS_PLACEHOLDER } from "./constants";
-import { getSSRConfigByEntry, getSSRInlineScript, getSSRMode } from "./utils";
+import { getSSRConfigByEntry, 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;
+  var nonce = config.nonce, useJsonScript = config.useJsonScript;
   var entryName = resource.entryName, route = resource.route;
   var headers = request.headers;
   var cookie = headers.get("cookie") || "";
@@ -31,10 +31,10 @@ 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,
+    useJsonScript,
     loaderContext,
     redirection: {},
     htmlModifiers: [],
@@ -64,7 +64,6 @@ function createSSRContext(request, options) {
     },
     reporter,
     mode: ssrMode,
-    inlineScript,
     onError,
     onTiming,
     loaderFailureMode

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

@@ -6,7 +6,7 @@ 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, getSSRInlineScript, safeReplace } from "../utils";
+import { attributesToString, 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 = [
@@ -14,6 +14,7 @@ function buildShellAfterTemplate(afterAppTemplate, options) {
       request,
       ssrConfig,
       nonce: config.nonce,
+      useJsonScript: config.useJsonScript,
       runtimeContext,
       renderLevel
     }),
@@ -57,7 +58,7 @@ function buildShellAfterTemplate(afterAppTemplate, options) {
   return buildHtml(afterAppTemplate, callbacks);
 }
 function createReplaceSSRData(options) {
-  var runtimeContext = options.runtimeContext, nonce = options.nonce, renderLevel = options.renderLevel, ssrConfig = options.ssrConfig;
+  var runtimeContext = options.runtimeContext, nonce = options.nonce, renderLevel = options.renderLevel, useJsonScript = options.useJsonScript, ssrConfig = options.ssrConfig;
   var _runtimeContext_ssrContext = runtimeContext.ssrContext, request = _runtimeContext_ssrContext.request, reporter = _runtimeContext_ssrContext.reporter;
   var headers = (typeof ssrConfig === "undefined" ? "undefined" : _type_of(ssrConfig)) === "object" && ssrConfig.unsafeHeaders ? Object.fromEntries(Object.entries(request.headers).filter(function(param) {
     var _param = _sliced_to_array(param, 2), key = _param[0], _ = _param[1];
@@ -90,10 +91,8 @@ function createReplaceSSRData(options) {
   var attrsStr = attributesToString({
     nonce
   });
-  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>");
+  var ssrDataScript = useJsonScript ? '<script type="application/json" id="'.concat(SSR_DATA_JSON_ID, '">').concat(serializeSSRData, "</script>") : "<script".concat(attrsStr, ">window._SSR_DATA = ").concat(serializeSSRData, "</script>");
   return function(template) {
     return safeReplace(template, SSR_DATA_PLACEHOLDER, ssrDataScript);
   };

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

@@ -90,7 +90,8 @@ var renderString = function() {
                     ssrContext: runtimeContext.ssrContext,
                     chunkSet,
                     routerContext,
-                    nonce: config.nonce
+                    nonce: config.nonce,
+                    useJsonScript: config.useJsonScript
                   })
                 ];
                 rootElement = wrapRuntimeContextProvider(serverRoot, Object.assign(runtimeContext, {

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, getSSRInlineScript, serializeErrors } from "../utils";
+import { attributesToString, serializeErrors } from "../utils";
 var _options = /* @__PURE__ */ new WeakMap(), _getSSRData = /* @__PURE__ */ new WeakSet(), _getSSRDataScripts = /* @__PURE__ */ new WeakSet();
 var SSRDataCollector = /* @__PURE__ */ function() {
   "use strict";
@@ -65,17 +65,15 @@ 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 = getSSRInlineScript(ssrConfig);
-  var useInlineScript = inlineScript !== false;
+  var _$_class_private_field_get = _class_private_field_get(this, _options), nonce = _$_class_private_field_get.nonce, _class_private_field_get_useJsonScript = _$_class_private_field_get.useJsonScript, useJsonScript = _class_private_field_get_useJsonScript === void 0 ? false : _class_private_field_get_useJsonScript;
   var serializeSSRData = serializeJson(ssrData);
   var attrsStr = attributesToString({
     nonce
   });
-  var ssrDataScripts = useInlineScript ? "<script".concat(attrsStr, ">window._SSR_DATA = ").concat(serializeSSRData, "</script>") : '<script type="application/json" id="'.concat(SSR_DATA_JSON_ID, '">').concat(serializeSSRData, "</script>");
+  var ssrDataScripts = useJsonScript ? '<script type="application/json" id="'.concat(SSR_DATA_JSON_ID, '">').concat(serializeSSRData, "</script>") : "<script".concat(attrsStr, ">window._SSR_DATA = ").concat(serializeSSRData, "</script>");
   if (routerData) {
     var serializedRouterData = serializeJson(routerData);
-    ssrDataScripts += useInlineScript ? "\n<script".concat(attrsStr, ">window._ROUTER_DATA = ").concat(serializedRouterData, "</script>") : '\n<script type="application/json" id="'.concat(ROUTER_DATA_JSON_ID, '">').concat(serializedRouterData, "</script>");
+    ssrDataScripts += useJsonScript ? '\n<script type="application/json" id="'.concat(ROUTER_DATA_JSON_ID, '">').concat(serializedRouterData, "</script>") : "\n<script".concat(attrsStr, ">window._ROUTER_DATA = ").concat(serializedRouterData, "</script>");
   }
   return ssrDataScripts;
 }

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

@@ -2,7 +2,6 @@ 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) {
@@ -71,17 +70,10 @@ 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/router/runtime/DeferredDataScripts.node.js

@@ -8,7 +8,7 @@ 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 useJsonScript = props === null || props === void 0 ? void 0 : props.useJsonScript;
   var hydratedRef = useRef(false);
   useEffect(function() {
     hydratedRef.current = true;
@@ -22,11 +22,11 @@ var DeferredDataScripts = function(props) {
       loaderData: staticContext.loaderData,
       errors: serializeErrors(staticContext.errors)
     };
-    var initialScript0 = inlineScript ? "" : "".concat(serializeJson(_ROUTER_DATA));
-    var initialScript1 = inlineScript ? [
+    var initialScript0 = useJsonScript ? "".concat(serializeJson(_ROUTER_DATA)) : "";
+    var initialScript1 = useJsonScript ? modernInline : [
       "_ROUTER_DATA = ".concat(serializeJson(_ROUTER_DATA), ";"),
       modernInline
-    ].join("\n") : modernInline;
+    ].join("\n");
     var deferredDataScripts = [];
     var initialScripts = Object.entries(activeDeferreds).map(function(param) {
       var _param = _sliced_to_array(param, 2), routeId = _param[0], deferredData = _param[1];

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

@@ -40,7 +40,7 @@ var routerPlugin = function() {
       return {
         beforeRender: function beforeRender(context, interrupt) {
           return _async_to_generator(function() {
-            var _context_ssrContext, _context_ssrContext_onTiming, _context_ssrContext1, pluginConfig, _merge, _merge_basename, basename, routesConfig, createRoutes, _context_ssrContext2, request, ssrMode, nonce, _context_ssrContext_loaderFailureMode, loaderFailureMode, baseUrl, _basename, reporter, requestContext, runner, routes, query, remixRequest, end, routerContext, cost, router;
+            var _context_ssrContext, _context_ssrContext_onTiming, _context_ssrContext1, pluginConfig, _merge, _merge_basename, basename, routesConfig, createRoutes, _context_ssrContext2, request, ssrMode, nonce, _context_ssrContext_loaderFailureMode, loaderFailureMode, baseUrl, _basename, reporter, requestContext, runner, routes, query, remixRequest, end, routerContext, cost, errors, router;
             return _ts_generator(this, function(_state) {
               switch (_state.label) {
                 case 0:
@@ -98,9 +98,11 @@ var routerPlugin = function() {
                       interrupt(routerContext)
                     ];
                   }
-                  if (routerContext.statusCode >= 500 && routerContext.statusCode < 600 && loaderFailureMode === "clientRender") {
+                  if (routerContext.statusCode >= 500 && routerContext.statusCode < 600 && // TODO: if loaderFailureMode is not 'errroBoundary', error log will not be printed.
+                  loaderFailureMode === "clientRender") {
                     routerContext.statusCode = 200;
-                    throw routerContext.errors[0];
+                    errors = Object.values(routerContext.errors);
+                    throw errors[0];
                   }
                   router = createStaticRouter(routes, routerContext);
                   context.routerContext = routerContext;
@@ -121,7 +123,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, inlineScript = ssrContext.inlineScript;
+              var nonce = ssrContext.nonce, mode = ssrContext.mode, useJsonScript = ssrContext.useJsonScript;
               var routerWrapper = /* @__PURE__ */ _jsxs(_Fragment, {
                 children: [
                   /* @__PURE__ */ _jsx(StaticRouterProvider, {
@@ -134,7 +136,7 @@ var routerPlugin = function() {
                   /* @__PURE__ */ _jsx(DeferredDataScripts, {
                     nonce,
                     context: routerContext,
-                    inlineScript
+                    useJsonScript
                   }),
                   mode === "stream" && JSX_SHELL_STREAM_END_MARK
                 ]

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

@@ -53,7 +53,7 @@ const runtimeGlobalContext = ({ srcDirectory, internalSrcAlias, metaName, entry,
   return `import { setGlobalContext } from '@${metaName}/runtime/context'
 
 import App from '${// We need to get the path of App.tsx here, but the entry is `src/entry.tsx`
-  formatImportPath(customEntry ? entry.replace("entry.tsx", "App").replace(srcDirectory, internalSrcAlias) : entry.replace(srcDirectory, internalSrcAlias).replace(".tsx", ""))}';
+  formatImportPath(customEntry ? entry.replace(/entry\.[tj]sx/, "App").replace(srcDirectory, internalSrcAlias) : entry.replace(srcDirectory, internalSrcAlias).replace(/\.[tj]sx/, ""))}';
 
 setGlobalContext({
   App,

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

@@ -5,10 +5,10 @@ import { createLoaderManager } from "../loader/loaderManager";
 import { getGlobalRunner } from "../plugin/runner";
 import { createRoot } from "../react";
 import { CHUNK_CSS_PLACEHOLDER } from "./constants";
-import { getSSRConfigByEntry, getSSRInlineScript, getSSRMode } from "./utils";
+import { getSSRConfigByEntry, getSSRMode } from "./utils";
 function createSSRContext(request, options) {
   const { config, loaderContext, onError, onTiming, locals, resource, params, responseProxy, logger, metrics, reporter } = options;
-  const { nonce } = config;
+  const { nonce, useJsonScript } = config;
   const { entryName, route } = resource;
   const { headers } = request;
   const cookie = headers.get("cookie") || "";
@@ -24,10 +24,10 @@ 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,
+    useJsonScript,
     loaderContext,
     redirection: {},
     htmlModifiers: [],
@@ -57,7 +57,6 @@ function createSSRContext(request, options) {
     },
     reporter,
     mode: ssrMode,
-    inlineScript,
     onError,
     onTiming,
     loaderFailureMode

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

@@ -2,7 +2,7 @@ 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, getSSRInlineScript, safeReplace } from "../utils";
+import { attributesToString, safeReplace } from "../utils";
 function buildShellAfterTemplate(afterAppTemplate, options) {
   const { request, config, ssrConfig, runtimeContext, renderLevel, entryName } = options;
   const callbacks = [
@@ -10,6 +10,7 @@ function buildShellAfterTemplate(afterAppTemplate, options) {
       request,
       ssrConfig,
       nonce: config.nonce,
+      useJsonScript: config.useJsonScript,
       runtimeContext,
       renderLevel
     }),
@@ -34,7 +35,7 @@ function buildShellAfterTemplate(afterAppTemplate, options) {
   return buildHtml(afterAppTemplate, callbacks);
 }
 function createReplaceSSRData(options) {
-  const { runtimeContext, nonce, renderLevel, ssrConfig } = options;
+  const { runtimeContext, nonce, renderLevel, useJsonScript, ssrConfig } = options;
   const { request, reporter } = runtimeContext.ssrContext;
   const headers = typeof ssrConfig === "object" && ssrConfig.unsafeHeaders ? Object.fromEntries(Object.entries(request.headers).filter(([key, _]) => {
     var _ssrConfig_unsafeHeaders_map, _ssrConfig_unsafeHeaders;
@@ -64,12 +65,8 @@ function createReplaceSSRData(options) {
   const attrsStr = attributesToString({
     nonce
   });
-  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>`;
+  const ssrDataScript = useJsonScript ? `<script type="application/json" id="${SSR_DATA_JSON_ID}">${serializeSSRData}</script>` : `<script${attrsStr}>window._SSR_DATA = ${serializeSSRData}</script>`;
   return (template) => safeReplace(template, SSR_DATA_PLACEHOLDER, ssrDataScript);
 }
 export {

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

@@ -58,7 +58,8 @@ const renderString = async (request, serverRoot, options) => {
         ssrContext: runtimeContext.ssrContext,
         chunkSet,
         routerContext,
-        nonce: config.nonce
+        nonce: config.nonce,
+        useJsonScript: config.useJsonScript
       })
     ];
     const rootElement = wrapRuntimeContextProvider(serverRoot, Object.assign(runtimeContext, {

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, getSSRInlineScript, serializeErrors } from "../utils";
+import { attributesToString, serializeErrors } from "../utils";
 var _options = /* @__PURE__ */ new WeakMap(), _getSSRData = /* @__PURE__ */ new WeakSet(), _getSSRDataScripts = /* @__PURE__ */ new WeakSet();
 class SSRDataCollector {
   effect() {
@@ -55,19 +55,17 @@ function getSSRData() {
   };
 }
 function getSSRDataScripts(ssrData, routerData) {
-  const { nonce, ssrConfig } = _class_private_field_get(this, _options);
-  const inlineScript = getSSRInlineScript(ssrConfig);
-  const useInlineScript = inlineScript !== false;
+  const { nonce, useJsonScript = false } = _class_private_field_get(this, _options);
   const serializeSSRData = serializeJson(ssrData);
   const attrsStr = attributesToString({
     nonce
   });
-  let ssrDataScripts = useInlineScript ? `<script${attrsStr}>window._SSR_DATA = ${serializeSSRData}</script>` : `<script type="application/json" id="${SSR_DATA_JSON_ID}">${serializeSSRData}</script>`;
+  let ssrDataScripts = useJsonScript ? `<script type="application/json" id="${SSR_DATA_JSON_ID}">${serializeSSRData}</script>` : `<script${attrsStr}>window._SSR_DATA = ${serializeSSRData}</script>`;
   if (routerData) {
     const serializedRouterData = serializeJson(routerData);
-    ssrDataScripts += useInlineScript ? `
-<script${attrsStr}>window._ROUTER_DATA = ${serializedRouterData}</script>` : `
-<script type="application/json" id="${ROUTER_DATA_JSON_ID}">${serializedRouterData}</script>`;
+    ssrDataScripts += useJsonScript ? `
+<script type="application/json" id="${ROUTER_DATA_JSON_ID}">${serializedRouterData}</script>` : `
+<script${attrsStr}>window._ROUTER_DATA = ${serializedRouterData}</script>`;
   }
   return ssrDataScripts;
 }

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

@@ -47,17 +47,10 @@ 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/router/runtime/DeferredDataScripts.node.js

@@ -7,7 +7,7 @@ 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 useJsonScript = props === null || props === void 0 ? void 0 : props.useJsonScript;
   const hydratedRef = useRef(false);
   useEffect(() => {
     hydratedRef.current = true;
@@ -21,11 +21,11 @@ const DeferredDataScripts = (props) => {
       loaderData: staticContext.loaderData,
       errors: serializeErrors(staticContext.errors)
     };
-    const initialScript0 = inlineScript ? "" : `${serializeJson(_ROUTER_DATA)}`;
-    const initialScript1 = inlineScript ? [
+    const initialScript0 = useJsonScript ? `${serializeJson(_ROUTER_DATA)}` : "";
+    const initialScript1 = useJsonScript ? modernInline : [
       `_ROUTER_DATA = ${serializeJson(_ROUTER_DATA)};`,
       modernInline
-    ].join("\n") : modernInline;
+    ].join("\n");
     const deferredDataScripts = [];
     const initialScripts = Object.entries(activeDeferreds).map(([routeId, deferredData]) => {
       const pendingKeys = new Set(deferredData.pendingKeys);

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

@@ -75,9 +75,11 @@ const routerPlugin = (userConfig = {}) => {
           if (routerContext instanceof Response) {
             return interrupt(routerContext);
           }
-          if (routerContext.statusCode >= 500 && routerContext.statusCode < 600 && loaderFailureMode === "clientRender") {
+          if (routerContext.statusCode >= 500 && routerContext.statusCode < 600 && // TODO: if loaderFailureMode is not 'errroBoundary', error log will not be printed.
+          loaderFailureMode === "clientRender") {
             routerContext.statusCode = 200;
-            throw routerContext.errors[0];
+            const errors = Object.values(routerContext.errors);
+            throw errors[0];
           }
           const router = createStaticRouter(routes, routerContext);
           context.routerContext = routerContext;
@@ -92,7 +94,7 @@ const routerPlugin = (userConfig = {}) => {
             return () => {
               const context = useContext(RuntimeReactContext);
               const { remixRouter, routerContext, ssrContext } = context;
-              const { nonce, mode, inlineScript } = ssrContext;
+              const { nonce, mode, useJsonScript } = ssrContext;
               const routerWrapper = /* @__PURE__ */ _jsxs(_Fragment, {
                 children: [
                   /* @__PURE__ */ _jsx(StaticRouterProvider, {
@@ -105,7 +107,7 @@ const routerPlugin = (userConfig = {}) => {
                   /* @__PURE__ */ _jsx(DeferredDataScripts, {
                     nonce,
                     context: routerContext,
-                    inlineScript
+                    useJsonScript
                   }),
                   mode === "stream" && JSX_SHELL_STREAM_END_MARK
                 ]

package/dist/types/core/server/string/ssrData.d.ts

@@ -10,6 +10,7 @@ export interface SSRDataCreatorOptions {
     ssrConfig?: SSRConfig;
     routerContext?: StaticHandlerContext;
     nonce?: string;
+    useJsonScript?: boolean;
 }
 export declare class SSRDataCollector implements Collector {
     #private;

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

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

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

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

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.63.0",
+  "version": "2.63.2",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -200,11 +200,11 @@
     "react-is": "^18",
     "react-side-effect": "^2.1.1",
     "styled-components": "^5.3.1",
-    "@modern-js/plugin": "2.63.0",
-    "@modern-js/plugin-data-loader": "2.63.0",
-    "@modern-js/types": "2.63.0",
-    "@modern-js/utils": "2.63.0",
-    "@modern-js/runtime-utils": "2.63.0"
+    "@modern-js/plugin": "2.63.2",
+    "@modern-js/types": "2.63.2",
+    "@modern-js/utils": "2.63.2",
+    "@modern-js/runtime-utils": "2.63.2",
+    "@modern-js/plugin-data-loader": "2.63.2"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -212,7 +212,7 @@
   },
   "devDependencies": {
     "@remix-run/web-fetch": "^4.1.3",
-    "@rsbuild/core": "~1.1.5",
+    "@rsbuild/core": "1.1.9",
     "@testing-library/react": "^13.4.0",
     "@types/cookie": "0.6.0",
     "@types/invariant": "^2.2.30",
@@ -227,11 +227,11 @@
     "ts-jest": "^29.1.0",
     "ts-node": "^10.9.1",
     "typescript": "^5",
-    "webpack": "^5.96.1",
-    "@modern-js/app-tools": "2.63.0",
-    "@scripts/jest-config": "2.63.0",
-    "@modern-js/core": "2.63.0",
-    "@scripts/build": "2.63.0"
+    "webpack": "^5.97.1",
+    "@modern-js/app-tools": "2.63.2",
+    "@modern-js/core": "2.63.2",
+    "@scripts/build": "2.63.2",
+    "@scripts/jest-config": "2.63.2"
   },
   "sideEffects": false,
   "publishConfig": {