@modern-js/runtime 2.65.2 → 2.65.3

package/dist/cjs/cli/code.js

@@ -132,6 +132,7 @@ const generateCode = async (entrypoints, appContext, config, hooks) => {
       let contextCode = "";
       if (!config.server.rsc) {
         contextCode = template.runtimeGlobalContext({
+          entryName,
           srcDirectory,
           internalSrcAlias,
           metaName,

package/dist/cjs/cli/template.js

@@ -110,7 +110,8 @@ import './${import_constants.ENTRY_POINT_RUNTIME_REGISTER_FILE_NAME}';
 `;
 const getImportRuntimeConfigCode = (srcDirectory, internalSrcAlias, runtimeConfigFile) => {
   if (runtimeConfigFile && (0, import_utils.findExists)(import_utils.JS_EXTENSIONS.map((ext) => import_path.default.resolve(srcDirectory, `${runtimeConfigFile}${ext}`)))) {
-    return `import runtimeConfig from '${internalSrcAlias}/${runtimeConfigFile}';`;
+    return `import modernRuntime from '${internalSrcAlias}/${runtimeConfigFile}';
+const runtimeConfig = typeof modernRuntime === 'function' ? modernRuntime(getCurrentEntryName()) : modernRuntime`;
   }
   return `let runtimeConfig;`;
 };
@@ -119,7 +120,8 @@ const getRegisterRuntimePluginCode = (entryName, name, config) => {
   return `plugins.push(${name}Plugin(mergeConfig(${JSON.stringify(config)}, (runtimeConfig || {})['${configName}'], ((runtimeConfig || {})['${configName}ByEntries'] || {})['${entryName}'], (getGlobalAppConfig() || {})['${configName}'])));`;
 };
 const runtimeRegister = ({ entryName, srcDirectory, internalSrcAlias, metaName, runtimeConfigFile, runtimePlugins }) => `import { registerPlugin, mergeConfig } from '@${metaName}/runtime/plugin';
-import { getGlobalAppConfig, getGlobalLayoutApp } from '@${metaName}/runtime/context';
+import { getGlobalAppConfig, getGlobalLayoutApp, getCurrentEntryName } from '@${metaName}/runtime/context';
+
 ${getImportRuntimeConfigCode(srcDirectory, internalSrcAlias, runtimeConfigFile)}
 
 const plugins = [];
@@ -130,13 +132,15 @@ ${getRegisterRuntimePluginCode(entryName, name, config)}
 `).join("\n")}
 registerPlugin(plugins, runtimeConfig);
 `;
-const runtimeGlobalContext = ({ srcDirectory, internalSrcAlias, metaName, entry, customEntry }) => {
+const runtimeGlobalContext = ({ entryName, srcDirectory, internalSrcAlias, metaName, entry, customEntry }) => {
   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\.[tj]sx/, "App").replace(srcDirectory, internalSrcAlias) : entry.replace(srcDirectory, internalSrcAlias).replace(/\.[tj]sx/, ""))}';
 
+const entryName = '${entryName}';
 setGlobalContext({
+  entryName,
   App,
 });`;
 };

package/dist/cjs/core/browser/index.js

@@ -112,9 +112,7 @@ async function render(App, id) {
       }),
       // garfish plugin params
       _internalRouterBaseName: App.props.basename,
-      ...{
-        ssrContext: ssrData.context
-      }
+      ssrContext: ssrData.context
     });
     context.initialData = (_ssrData_data1 = ssrData.data) === null || _ssrData_data1 === void 0 ? void 0 : _ssrData_data1.initialData;
     const initialData = await runBeforeRender(context);

package/dist/cjs/core/compat/requestContext.js

@@ -0,0 +1,48 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var requestContext_exports = {};
+__export(requestContext_exports, {
+  makeRequestContext: () => makeRequestContext,
+  requestContextPlugin: () => requestContextPlugin
+});
+module.exports = __toCommonJS(requestContext_exports);
+const makeRequestContext = (context) => {
+  const baseSSRContext = context.ssrContext;
+  const requestContext = baseSSRContext ? {
+    isBrowser: context.isBrowser,
+    request: baseSSRContext.request || {},
+    response: baseSSRContext.response || {},
+    logger: baseSSRContext.logger || {}
+  } : {};
+  return requestContext;
+};
+const requestContextPlugin = () => ({
+  name: "@modern-js/runtime-plugin-request-context",
+  setup(api) {
+    api.onBeforeRender((context) => {
+      const requestContext = makeRequestContext(context);
+      context.context = requestContext;
+    });
+  }
+});
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  makeRequestContext,
+  requestContextPlugin
+});

package/dist/cjs/core/compatible.js

@@ -111,9 +111,7 @@ const bootstrap = async (BootApp, id, root, ReactDOM) => {
         loaderManager: (0, import_loaderManager.createLoaderManager)(initialLoadersState, {
           skipStatic: true
         }),
-        ...ssrData ? {
-          ssrContext: ssrData === null || ssrData === void 0 ? void 0 : ssrData.context
-        } : {}
+        ssrContext: (ssrData === null || ssrData === void 0 ? void 0 : ssrData.context) || {}
       });
       context.initialData = ssrData === null || ssrData === void 0 ? void 0 : (_ssrData_data1 = ssrData.data) === null || _ssrData_data1 === void 0 ? void 0 : _ssrData_data1.initialData;
       const initialData = await runBeforeRender(context);
@@ -173,19 +171,9 @@ const bootstrap = async (BootApp, id, root, ReactDOM) => {
 const useRuntimeContext = () => {
   var _context_ssrContext, _context_ssrContext1;
   const context = (0, import_react.useContext)(import_runtime.RuntimeReactContext);
-  const baseSSRContext = context.ssrContext;
-  const tSSRContext = baseSSRContext ? {
-    isBrowser: context.isBrowser,
-    request: baseSSRContext.request || {},
-    response: baseSSRContext.response || {},
-    logger: baseSSRContext.logger || {},
-    getInitData: () => {
-      return Object.freeze(context.initialData);
-    }
-  } : {};
   const pickedContext = {
     ...context,
-    context: tSSRContext,
+    context: context.context || {},
     request: (_context_ssrContext = context.ssrContext) === null || _context_ssrContext === void 0 ? void 0 : _context_ssrContext.request,
     response: (_context_ssrContext1 = context.ssrContext) === null || _context_ssrContext1 === void 0 ? void 0 : _context_ssrContext1.response
   };

package/dist/cjs/core/context/index.js

@@ -19,6 +19,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var context_exports = {};
 __export(context_exports, {
   RuntimeReactContext: () => import_runtime.RuntimeReactContext,
+  getCurrentEntryName: () => getCurrentEntryName,
   getGlobalApp: () => getGlobalApp,
   getGlobalAppConfig: () => getGlobalAppConfig,
   getGlobalAppInit: () => getGlobalAppInit,
@@ -34,6 +35,7 @@ module.exports = __toCommonJS(context_exports);
 var import_runtime = require("./runtime");
 const globalContext = {};
 function setGlobalContext(context) {
+  globalContext.entryName = context.entryName;
   globalContext.App = context.App;
   globalContext.routes = context.routes;
   globalContext.appInit = context.appInit;
@@ -41,6 +43,9 @@ function setGlobalContext(context) {
   globalContext.layoutApp = context.layoutApp;
   globalContext.RSCRoot = context.RSCRoot;
 }
+function getCurrentEntryName() {
+  return globalContext.entryName;
+}
 function getGlobalRSCRoot() {
   return globalContext.RSCRoot;
 }
@@ -70,6 +75,7 @@ function getGlobalLayoutApp() {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   RuntimeReactContext,
+  getCurrentEntryName,
   getGlobalApp,
   getGlobalAppConfig,
   getGlobalAppInit,

package/dist/cjs/core/context/monitors/default.js

@@ -24,16 +24,11 @@ module.exports = __toCommonJS(default_exports);
 const defaultMonitors = {
   counter(name, ...args) {
   },
-  info(message, ...args) {
-  },
-  debug(message, ...args) {
-  },
-  trace(message, ...args) {
-  },
-  warn(message, ...args) {
-  },
-  error(message, ...args) {
-  },
+  info: console.info,
+  debug: console.debug,
+  trace: console.trace,
+  warn: console.warn,
+  error: console.error,
   timing(name, dur, ...args) {
   }
 };

package/dist/cjs/core/context/response/index.js

@@ -0,0 +1,43 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var response_exports = {};
+__export(response_exports, {
+  getResponseProxy: () => getResponseProxy,
+  redirect: () => redirect,
+  setHeaders: () => setHeaders,
+  setStatus: () => setStatus
+});
+module.exports = __toCommonJS(response_exports);
+const getResponseProxy = () => {
+  return null;
+};
+const setHeaders = (headers) => {
+};
+const setStatus = (status) => {
+};
+const redirect = (url, init) => {
+  console.warn(`You should not use this API in the browser, please use the router's redirect or useNavigate method.`);
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getResponseProxy,
+  redirect,
+  setHeaders,
+  setStatus
+});

package/dist/cjs/core/context/response/index.server.js

@@ -0,0 +1,62 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var index_server_exports = {};
+__export(index_server_exports, {
+  getResponseProxy: () => getResponseProxy,
+  redirect: () => redirect,
+  setHeaders: () => setHeaders,
+  setStatus: () => setStatus
+});
+module.exports = __toCommonJS(index_server_exports);
+var import_node = require("@modern-js/runtime-utils/node");
+const getResponseProxy = () => {
+  const context = import_node.storage.useContext();
+  return context === null || context === void 0 ? void 0 : context.responseProxy;
+};
+const setHeaders = (headers) => {
+  const responseProxy = getResponseProxy();
+  Object.entries(headers).forEach(([key, value]) => {
+    responseProxy.headers[key] = value;
+  });
+};
+const setStatus = (status) => {
+  const responseProxy = getResponseProxy();
+  responseProxy.status = status;
+};
+const redirect = (url, init) => {
+  var _init_status;
+  const status = init === void 0 ? 307 : typeof init === "number" ? init : (_init_status = init.status) !== null && _init_status !== void 0 ? _init_status : 307;
+  var _init_headers;
+  const headers = init === void 0 ? {} : typeof init === "number" ? {} : (_init_headers = init.headers) !== null && _init_headers !== void 0 ? _init_headers : {};
+  setStatus(status);
+  setHeaders({
+    Location: url,
+    ...init && typeof init === "object" ? Object.fromEntries(Object.entries(headers).map(([k, v]) => [
+      k,
+      String(v)
+    ])) : {}
+  });
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getResponseProxy,
+  redirect,
+  setHeaders,
+  setStatus
+});

package/dist/cjs/core/plugin/index.js

@@ -26,12 +26,14 @@ var import_runtime = require("@modern-js/plugin-v2/runtime");
 var import_merge = require("@modern-js/runtime-utils/merge");
 var import_compat = require("../compat");
 var import_hooks = require("../compat/hooks");
+var import_requestContext = require("../compat/requestContext");
 var import_context = require("../context");
 function registerPlugin(internalPlugins, runtimeConfig) {
   const { plugins = [] } = runtimeConfig || {};
   const { runtimeContext } = import_runtime.runtime.run({
     plugins: [
       (0, import_compat.compatPlugin)(),
+      (0, import_requestContext.requestContextPlugin)(),
       ...internalPlugins,
       ...plugins
     ],

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

@@ -68,6 +68,7 @@ function createSSRContext(request, options) {
       params,
       headers: headersData,
       host,
+      referer: headers.get("referer"),
       raw: request
     },
     response: {
@@ -75,7 +76,7 @@ function createSSRContext(request, options) {
         responseProxy.headers[key] = value;
       },
       status(code) {
-        responseProxy.code = code;
+        responseProxy.status = code;
       },
       locals: locals || {}
     },
@@ -89,10 +90,15 @@ function createSSRContext(request, options) {
 const createRequestHandler = async (handleRequest, createRequestOptions) => {
   const requestHandler = async (request, options) => {
     const headersData = (0, import_request.parseHeaders)(request);
+    const responseProxy = {
+      headers: {},
+      status: -1
+    };
     return import_node.storage.run({
       headers: headersData,
       request,
-      monitors: options.monitors
+      monitors: options.monitors,
+      responseProxy
     }, async () => {
       var _context_routerContext, _context_routerContext1, _context_routerContext2;
       const Root = (0, import_react.createRoot)();
@@ -108,10 +114,6 @@ const createRequestHandler = async (handleRequest, createRequestOptions) => {
         const init = (0, import_context.getGlobalAppInit)();
         return init === null || init === void 0 ? void 0 : init(context2);
       };
-      const responseProxy = {
-        headers: {},
-        code: -1
-      };
       const ssrContext = createSSRContext(request, {
         ...options,
         responseProxy
@@ -166,9 +168,9 @@ const createRequestHandler = async (handleRequest, createRequestOptions) => {
       Object.entries(responseProxy.headers).forEach(([key, value]) => {
         response.headers.set(key, value);
       });
-      if (responseProxy.code !== -1) {
+      if (responseProxy.status !== -1) {
         return new Response(response.body, {
-          status: responseProxy.code,
+          status: responseProxy.status,
           headers: response.headers
         });
       }

package/dist/cjs/index.js

@@ -26,6 +26,9 @@ __export(src_exports, {
   getMonitors: () => import_monitors.getMonitors,
   getRequest: () => import_request.getRequest,
   isBrowser: () => import_common.isBrowser,
+  redirect: () => import_response.redirect,
+  setHeaders: () => import_response.setHeaders,
+  setStatus: () => import_response.setStatus,
   useLoader: () => import_core.useLoader,
   useRuntimeContext: () => import_core.useRuntimeContext
 });
@@ -33,6 +36,7 @@ module.exports = __toCommonJS(src_exports);
 var import_common = require("./common");
 var import_monitors = require("./core/context/monitors");
 var import_request = require("./core/context/request");
+var import_response = require("./core/context/response");
 var import_core = require("./core");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
@@ -44,6 +48,9 @@ var import_core = require("./core");
   getMonitors,
   getRequest,
   isBrowser,
+  redirect,
+  setHeaders,
+  setStatus,
   useLoader,
   useRuntimeContext
 });

package/dist/cjs/react-server.js

@@ -18,11 +18,21 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var react_server_exports = {};
 __export(react_server_exports, {
-  getRequest: () => import_request.getRequest
+  getMonitors: () => import_monitors.getMonitors,
+  getRequest: () => import_request.getRequest,
+  redirect: () => import_response.redirect,
+  setHeaders: () => import_response.setHeaders,
+  setStatus: () => import_response.setStatus
 });
 module.exports = __toCommonJS(react_server_exports);
 var import_request = require("./core/context/request");
+var import_monitors = require("./core/context/monitors");
+var import_response = require("./core/context/response");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getRequest
+  getMonitors,
+  getRequest,
+  redirect,
+  setHeaders,
+  setStatus
 });

package/dist/cjs/router/cli/code/templates.js

@@ -398,7 +398,7 @@ function ssrLoaderCombinedModule(entrypoints, entrypoint, config, appContext) {
   }
   return null;
 }
-const runtimeGlobalContext = async ({ metaName, srcDirectory, nestedRoutesEntry, internalSrcAlias, globalApp }) => {
+const runtimeGlobalContext = async ({ entryName, metaName, srcDirectory, nestedRoutesEntry, internalSrcAlias, globalApp }) => {
   const imports = [
     `import { setGlobalContext } from '@${metaName}/runtime/context';`
   ];
@@ -444,7 +444,9 @@ const runtimeGlobalContext = async ({ metaName, srcDirectory, nestedRoutesEntry,
 
 import { routes } from './routes';
 
+const entryName = '${entryName}';
 setGlobalContext({
+  entryName,
   layoutApp,
   routes,
   appInit,

package/dist/cjs/router/cli/handler.js

@@ -54,6 +54,7 @@ async function handleGeneratorEntryCode(api, entrypoints) {
     if (entrypoint.nestedRoutesEntry || entrypoint.pageRoutesEntry) {
       var _entrypoint_fileSystemRoutes;
       generatorRegisterCode(internalDirectory, entrypoint.entryName, await templates.runtimeGlobalContext({
+        entryName: entrypoint.entryName,
         metaName: appContext.metaName,
         srcDirectory: appContext.srcDirectory,
         nestedRoutesEntry: entrypoint.nestedRoutesEntry,

package/dist/esm/cli/code.js

@@ -185,6 +185,7 @@ var generateCode = function() {
                           12
                         ];
                       contextCode = template.runtimeGlobalContext({
+                        entryName,
                         srcDirectory,
                         internalSrcAlias,
                         metaName,

package/dist/esm/cli/template.js

@@ -32,7 +32,7 @@ var getImportRuntimeConfigCode = function(srcDirectory, internalSrcAlias, runtim
   if (runtimeConfigFile && findExists(JS_EXTENSIONS.map(function(ext) {
     return path.resolve(srcDirectory, "".concat(runtimeConfigFile).concat(ext));
   }))) {
-    return "import runtimeConfig from '".concat(internalSrcAlias, "/").concat(runtimeConfigFile, "';");
+    return "import modernRuntime from '".concat(internalSrcAlias, "/").concat(runtimeConfigFile, "';\nconst runtimeConfig = typeof modernRuntime === 'function' ? modernRuntime(getCurrentEntryName()) : modernRuntime");
   }
   return "let runtimeConfig;";
 };
@@ -42,14 +42,14 @@ var getRegisterRuntimePluginCode = function(entryName, name, config) {
 };
 var runtimeRegister = function(param) {
   var entryName = param.entryName, srcDirectory = param.srcDirectory, internalSrcAlias = param.internalSrcAlias, metaName = param.metaName, runtimeConfigFile = param.runtimeConfigFile, runtimePlugins = param.runtimePlugins;
-  return "import { registerPlugin, mergeConfig } from '@".concat(metaName, "/runtime/plugin';\nimport { getGlobalAppConfig, getGlobalLayoutApp } from '@").concat(metaName, "/runtime/context';\n").concat(getImportRuntimeConfigCode(srcDirectory, internalSrcAlias, runtimeConfigFile), "\n\nconst plugins = [];\n\n").concat(runtimePlugins.map(function(param2) {
+  return "import { registerPlugin, mergeConfig } from '@".concat(metaName, "/runtime/plugin';\nimport { getGlobalAppConfig, getGlobalLayoutApp, getCurrentEntryName } from '@").concat(metaName, "/runtime/context';\n\n").concat(getImportRuntimeConfigCode(srcDirectory, internalSrcAlias, runtimeConfigFile), "\n\nconst plugins = [];\n\n").concat(runtimePlugins.map(function(param2) {
     var name = param2.name, path2 = param2.path, config = param2.config;
     return "import { ".concat(name, "Plugin } from '").concat(path2, "';\n\n").concat(getRegisterRuntimePluginCode(entryName, name, config), "\n");
   }).join("\n"), "\nregisterPlugin(plugins, runtimeConfig);\n");
 };
 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\.[tj]sx/, "App").replace(srcDirectory, internalSrcAlias) : entry.replace(srcDirectory, internalSrcAlias).replace(/\.[tj]sx/, "")), "';\n\nsetGlobalContext({\n  App,\n});");
+  var entryName = param.entryName, 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\.[tj]sx/, "App").replace(srcDirectory, internalSrcAlias) : entry.replace(srcDirectory, internalSrcAlias).replace(/\.[tj]sx/, "")), "';\n\nconst entryName = '").concat(entryName, "';\nsetGlobalContext({\n  entryName,\n  App,\n});");
 };
 var runtimeGlobalContextForRSCServer = function(param) {
   var metaName = param.metaName;

package/dist/esm/core/browser/index.js

@@ -133,15 +133,14 @@ function _render() {
             res[key] = loaderData;
             return res;
           }, {});
-          Object.assign(context, _object_spread({
+          Object.assign(context, {
             loaderManager: createLoaderManager(initialLoadersState, {
               skipStatic: true
             }),
             // garfish plugin params
-            _internalRouterBaseName: App.props.basename
-          }, {
+            _internalRouterBaseName: App.props.basename,
             ssrContext: ssrData.context
-          }));
+          });
           context.initialData = (_ssrData_data1 = ssrData.data) === null || _ssrData_data1 === void 0 ? void 0 : _ssrData_data1.initialData;
           return [
             4,

package/dist/esm/core/compat/requestContext.js

@@ -0,0 +1,25 @@
+var makeRequestContext = function(context) {
+  var baseSSRContext = context.ssrContext;
+  var requestContext = baseSSRContext ? {
+    isBrowser: context.isBrowser,
+    request: baseSSRContext.request || {},
+    response: baseSSRContext.response || {},
+    logger: baseSSRContext.logger || {}
+  } : {};
+  return requestContext;
+};
+var requestContextPlugin = function() {
+  return {
+    name: "@modern-js/runtime-plugin-request-context",
+    setup: function setup(api) {
+      api.onBeforeRender(function(context) {
+        var requestContext = makeRequestContext(context);
+        context.context = requestContext;
+      });
+    }
+  };
+};
+export {
+  makeRequestContext,
+  requestContextPlugin
+};

package/dist/esm/core/compatible.js

@@ -106,13 +106,12 @@ var bootstrap = function() {
             res[key] = loaderData;
             return res;
           }, {});
-          Object.assign(context, _object_spread({
+          Object.assign(context, {
             loaderManager: createLoaderManager(initialLoadersState, {
               skipStatic: true
-            })
-          }, ssrData ? {
-            ssrContext: ssrData === null || ssrData === void 0 ? void 0 : ssrData.context
-          } : {}));
+            }),
+            ssrContext: (ssrData === null || ssrData === void 0 ? void 0 : ssrData.context) || {}
+          });
           context.initialData = ssrData === null || ssrData === void 0 ? void 0 : (_ssrData_data1 = ssrData.data) === null || _ssrData_data1 === void 0 ? void 0 : _ssrData_data1.initialData;
           return [
             4,
@@ -195,18 +194,8 @@ var bootstrap = function() {
 var useRuntimeContext = function() {
   var _context_ssrContext, _context_ssrContext1;
   var context = useContext(RuntimeReactContext);
-  var baseSSRContext = context.ssrContext;
-  var tSSRContext = baseSSRContext ? {
-    isBrowser: context.isBrowser,
-    request: baseSSRContext.request || {},
-    response: baseSSRContext.response || {},
-    logger: baseSSRContext.logger || {},
-    getInitData: function() {
-      return Object.freeze(context.initialData);
-    }
-  } : {};
   var pickedContext = _object_spread_props(_object_spread({}, context), {
-    context: tSSRContext,
+    context: context.context || {},
     request: (_context_ssrContext = context.ssrContext) === null || _context_ssrContext === void 0 ? void 0 : _context_ssrContext.request,
     response: (_context_ssrContext1 = context.ssrContext) === null || _context_ssrContext1 === void 0 ? void 0 : _context_ssrContext1.response
   });

package/dist/esm/core/context/index.js

@@ -1,6 +1,7 @@
 import { RuntimeReactContext, getInitialContext } from "./runtime";
 var globalContext = {};
 function setGlobalContext(context) {
+  globalContext.entryName = context.entryName;
   globalContext.App = context.App;
   globalContext.routes = context.routes;
   globalContext.appInit = context.appInit;
@@ -8,6 +9,9 @@ function setGlobalContext(context) {
   globalContext.layoutApp = context.layoutApp;
   globalContext.RSCRoot = context.RSCRoot;
 }
+function getCurrentEntryName() {
+  return globalContext.entryName;
+}
 function getGlobalRSCRoot() {
   return globalContext.RSCRoot;
 }
@@ -36,6 +40,7 @@ function getGlobalLayoutApp() {
 }
 export {
   RuntimeReactContext,
+  getCurrentEntryName,
   getGlobalApp,
   getGlobalAppConfig,
   getGlobalAppInit,

package/dist/esm/core/context/monitors/default.js

@@ -4,31 +4,11 @@ var defaultMonitors = {
       args[_key - 1] = arguments[_key];
     }
   },
-  info: function info(message) {
-    for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-      args[_key - 1] = arguments[_key];
-    }
-  },
-  debug: function debug(message) {
-    for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-      args[_key - 1] = arguments[_key];
-    }
-  },
-  trace: function trace(message) {
-    for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-      args[_key - 1] = arguments[_key];
-    }
-  },
-  warn: function warn(message) {
-    for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-      args[_key - 1] = arguments[_key];
-    }
-  },
-  error: function error(message) {
-    for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-      args[_key - 1] = arguments[_key];
-    }
-  },
+  info: console.info,
+  debug: console.debug,
+  trace: console.trace,
+  warn: console.warn,
+  error: console.error,
   timing: function timing(name, dur) {
     for (var _len = arguments.length, args = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
       args[_key - 2] = arguments[_key];

package/dist/esm/core/context/response/index.js

@@ -0,0 +1,16 @@
+var getResponseProxy = function() {
+  return null;
+};
+var setHeaders = function(headers) {
+};
+var setStatus = function(status) {
+};
+var redirect = function(url, init) {
+  console.warn("You should not use this API in the browser, please use the router's redirect or useNavigate method.");
+};
+export {
+  getResponseProxy,
+  redirect,
+  setHeaders,
+  setStatus
+};