@modern-js/runtime 2.65.1 → 2.65.3

package/dist/cjs/cache/index.js

@@ -0,0 +1,22 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+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 __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var cache_exports = {};
+module.exports = __toCommonJS(cache_exports);
+__reExport(cache_exports, require("@modern-js/runtime-utils/cache"), module.exports);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ...require("@modern-js/runtime-utils/cache")
+});

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/ssr/index.js

@@ -121,7 +121,7 @@ const ssrPlugin = () => ({
         source: {
           alias: {
             // ensure that all packages use the same storage in @modern-js/runtime-utils/node
-            "@modern-js/runtime-utils/node$": require.resolve("@modern-js/runtime-utils/node")
+            "@modern-js/runtime-utils/node$": require.resolve("@modern-js/runtime-utils/node").replace(`${import_path.default.sep}cjs${import_path.default.sep}`, `${import_path.default.sep}esm${import_path.default.sep}`)
           }
         },
         tools: {

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

@@ -0,0 +1,38 @@
+"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 default_exports = {};
+__export(default_exports, {
+  defaultMonitors: () => defaultMonitors
+});
+module.exports = __toCommonJS(default_exports);
+const defaultMonitors = {
+  counter(name, ...args) {
+  },
+  info: console.info,
+  debug: console.debug,
+  trace: console.trace,
+  warn: console.warn,
+  error: console.error,
+  timing(name, dur, ...args) {
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  defaultMonitors
+});

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

@@ -0,0 +1,31 @@
+"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 monitors_exports = {};
+__export(monitors_exports, {
+  getMonitors: () => getMonitors
+});
+module.exports = __toCommonJS(monitors_exports);
+var import_default = require("./default");
+const getMonitors = () => {
+  return import_default.defaultMonitors;
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getMonitors
+});

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

@@ -0,0 +1,33 @@
+"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, {
+  getMonitors: () => getMonitors
+});
+module.exports = __toCommonJS(index_server_exports);
+var import_node = require("@modern-js/runtime-utils/node");
+var import_default = require("./default");
+const getMonitors = () => {
+  const storageContext = import_node.storage.useContext();
+  return storageContext.monitors || import_default.defaultMonitors;
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getMonitors
+});

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

@@ -0,0 +1,30 @@
+"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 request_exports = {};
+__export(request_exports, {
+  getRequest: () => getRequest
+});
+module.exports = __toCommonJS(request_exports);
+const getRequest = () => {
+  return new Request(location.href);
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getRequest
+});

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

@@ -0,0 +1,32 @@
+"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, {
+  getRequest: () => getRequest
+});
+module.exports = __toCommonJS(index_server_exports);
+var import_node = require("@modern-js/runtime-utils/node");
+const getRequest = () => {
+  const context = import_node.storage.useContext();
+  return context === null || context === void 0 ? void 0 : context.request;
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getRequest
+});

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
     ],