@modern-js/runtime 2.65.1 → 2.65.3

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

@@ -70,7 +70,8 @@ import './${ENTRY_POINT_RUNTIME_REGISTER_FILE_NAME}';
 `;
 const getImportRuntimeConfigCode = (srcDirectory, internalSrcAlias, runtimeConfigFile) => {
   if (runtimeConfigFile && findExists(JS_EXTENSIONS.map((ext) => path.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;`;
 };
@@ -79,7 +80,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 = [];
@@ -90,13 +92,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`
   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/esm-node/core/browser/index.js

@@ -75,9 +75,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/esm-node/core/compat/requestContext.js

@@ -0,0 +1,23 @@
+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;
+    });
+  }
+});
+export {
+  makeRequestContext,
+  requestContextPlugin
+};

package/dist/esm-node/core/compatible.js

@@ -76,9 +76,7 @@ const bootstrap = async (BootApp, id, root, ReactDOM) => {
         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);
@@ -138,19 +136,9 @@ const bootstrap = async (BootApp, id, root, ReactDOM) => {
 const useRuntimeContext = () => {
   var _context_ssrContext, _context_ssrContext1;
   const context = useContext(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/esm-node/core/context/index.js

@@ -1,6 +1,7 @@
 import { RuntimeReactContext, getInitialContext } from "./runtime";
 const 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-node/core/context/monitors/default.js

@@ -0,0 +1,14 @@
+const defaultMonitors = {
+  counter(name, ...args) {
+  },
+  info: console.info,
+  debug: console.debug,
+  trace: console.trace,
+  warn: console.warn,
+  error: console.error,
+  timing(name, dur, ...args) {
+  }
+};
+export {
+  defaultMonitors
+};

package/dist/esm-node/core/context/monitors/index.js

@@ -0,0 +1,7 @@
+import { defaultMonitors } from "./default";
+const getMonitors = () => {
+  return defaultMonitors;
+};
+export {
+  getMonitors
+};

package/dist/esm-node/core/context/monitors/index.server.js

@@ -0,0 +1,9 @@
+import { storage } from "@modern-js/runtime-utils/node";
+import { defaultMonitors } from "./default";
+const getMonitors = () => {
+  const storageContext = storage.useContext();
+  return storageContext.monitors || defaultMonitors;
+};
+export {
+  getMonitors
+};

package/dist/esm-node/core/context/request/index.js

@@ -0,0 +1,6 @@
+const getRequest = () => {
+  return new Request(location.href);
+};
+export {
+  getRequest
+};

package/dist/esm-node/core/context/request/index.server.js

@@ -0,0 +1,8 @@
+import { storage } from "@modern-js/runtime-utils/node";
+const getRequest = () => {
+  const context = storage.useContext();
+  return context === null || context === void 0 ? void 0 : context.request;
+};
+export {
+  getRequest
+};

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

@@ -0,0 +1,16 @@
+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.`);
+};
+export {
+  getResponseProxy,
+  redirect,
+  setHeaders,
+  setStatus
+};

package/dist/esm-node/core/context/response/index.server.js

@@ -0,0 +1,35 @@
+import { storage } from "@modern-js/runtime-utils/node";
+const getResponseProxy = () => {
+  const context = 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)
+    ])) : {}
+  });
+};
+export {
+  getResponseProxy,
+  redirect,
+  setHeaders,
+  setStatus
+};

package/dist/esm-node/core/plugin/index.js

@@ -2,12 +2,14 @@ import { runtime } from "@modern-js/plugin-v2/runtime";
 import { merge } from "@modern-js/runtime-utils/merge";
 import { compatPlugin } from "../compat";
 import { handleSetupResult } from "../compat/hooks";
+import { requestContextPlugin } from "../compat/requestContext";
 import { setGlobalInternalRuntimeContext } from "../context";
 function registerPlugin(internalPlugins, runtimeConfig) {
   const { plugins = [] } = runtimeConfig || {};
   const { runtimeContext } = runtime.run({
     plugins: [
       compatPlugin(),
+      requestContextPlugin(),
       ...internalPlugins,
       ...plugins
     ],

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

@@ -1,3 +1,4 @@
+import { storage } from "@modern-js/runtime-utils/node";
 import { getPathname, parseCookie, parseHeaders, parseQuery } from "@modern-js/runtime-utils/universal/request";
 import { getGlobalAppInit, getGlobalInternalRuntimeContext, getGlobalRSCRoot } from "../context";
 import { getInitialContext } from "../context/runtime";
@@ -44,6 +45,7 @@ function createSSRContext(request, options) {
       params,
       headers: headersData,
       host,
+      referer: headers.get("referer"),
       raw: request
     },
     response: {
@@ -51,7 +53,7 @@ function createSSRContext(request, options) {
         responseProxy.headers[key] = value;
       },
       status(code) {
-        responseProxy.code = code;
+        responseProxy.status = code;
       },
       locals: locals || {}
     },
@@ -64,85 +66,93 @@ function createSSRContext(request, options) {
 }
 const createRequestHandler = async (handleRequest, createRequestOptions) => {
   const requestHandler = async (request, options) => {
-    var _context_routerContext, _context_routerContext1, _context_routerContext2;
-    const Root = createRoot();
-    const internalRuntimeContext = getGlobalInternalRuntimeContext();
-    const hooks = internalRuntimeContext.hooks;
-    const { routeManifest } = options.resource;
-    const context = getInitialContext(false, routeManifest);
-    const runBeforeRender = async (context2) => {
-      const result = await hooks.onBeforeRender.call(context2);
-      if (typeof Response !== "undefined" && result instanceof Response) {
-        return result;
-      }
-      const init = getGlobalAppInit();
-      return init === null || init === void 0 ? void 0 : init(context2);
-    };
+    const headersData = parseHeaders(request);
     const responseProxy = {
       headers: {},
-      code: -1
+      status: -1
     };
-    const ssrContext = createSSRContext(request, {
-      ...options,
+    return storage.run({
+      headers: headersData,
+      request,
+      monitors: options.monitors,
       responseProxy
-    });
-    Object.assign(context, {
-      ssrContext,
-      isBrowser: false,
-      loaderManager: createLoaderManager({}, {
-        skipNonStatic: options.staticGenerate,
-        // if not static generate, only non-static loader can exec on prod env
-        skipStatic: process.env.NODE_ENV === "production" && !options.staticGenerate
-      })
-    });
-    const getRedirectResponse = (result) => {
-      if (typeof Response !== "undefined" && // fix: ssg workflow doesn't inject Web Response
-      result instanceof Response && result.status >= 300 && result.status <= 399) {
-        const { status } = result;
-        const redirectUrl = result.headers.get("Location") || "/";
-        const { ssrContext: ssrContext2 } = context;
-        if (ssrContext2) {
-          return new Response(null, {
-            status,
-            headers: {
-              Location: redirectUrl
-            }
-          });
+    }, async () => {
+      var _context_routerContext, _context_routerContext1, _context_routerContext2;
+      const Root = createRoot();
+      const internalRuntimeContext = getGlobalInternalRuntimeContext();
+      const hooks = internalRuntimeContext.hooks;
+      const { routeManifest } = options.resource;
+      const context = getInitialContext(false, routeManifest);
+      const runBeforeRender = async (context2) => {
+        const result = await hooks.onBeforeRender.call(context2);
+        if (typeof Response !== "undefined" && result instanceof Response) {
+          return result;
+        }
+        const init = getGlobalAppInit();
+        return init === null || init === void 0 ? void 0 : init(context2);
+      };
+      const ssrContext = createSSRContext(request, {
+        ...options,
+        responseProxy
+      });
+      Object.assign(context, {
+        ssrContext,
+        isBrowser: false,
+        loaderManager: createLoaderManager({}, {
+          skipNonStatic: options.staticGenerate,
+          // if not static generate, only non-static loader can exec on prod env
+          skipStatic: process.env.NODE_ENV === "production" && !options.staticGenerate
+        })
+      });
+      const getRedirectResponse = (result) => {
+        if (typeof Response !== "undefined" && // fix: ssg workflow doesn't inject Web Response
+        result instanceof Response && result.status >= 300 && result.status <= 399) {
+          const { status } = result;
+          const redirectUrl = result.headers.get("Location") || "/";
+          const { ssrContext: ssrContext2 } = context;
+          if (ssrContext2) {
+            return new Response(null, {
+              status,
+              headers: {
+                Location: redirectUrl
+              }
+            });
+          }
         }
+        return void 0;
+      };
+      const initialData = await runBeforeRender(context);
+      if (((_context_routerContext = context.routerContext) === null || _context_routerContext === void 0 ? void 0 : _context_routerContext.statusCode) && ((_context_routerContext1 = context.routerContext) === null || _context_routerContext1 === void 0 ? void 0 : _context_routerContext1.statusCode) !== 200) {
+        var _context_routerContext3, _context_ssrContext;
+        (_context_ssrContext = context.ssrContext) === null || _context_ssrContext === void 0 ? void 0 : _context_ssrContext.response.status((_context_routerContext3 = context.routerContext) === null || _context_routerContext3 === void 0 ? void 0 : _context_routerContext3.statusCode);
       }
-      return void 0;
-    };
-    const initialData = await runBeforeRender(context);
-    if (((_context_routerContext = context.routerContext) === null || _context_routerContext === void 0 ? void 0 : _context_routerContext.statusCode) && ((_context_routerContext1 = context.routerContext) === null || _context_routerContext1 === void 0 ? void 0 : _context_routerContext1.statusCode) !== 200) {
-      var _context_routerContext3, _context_ssrContext;
-      (_context_ssrContext = context.ssrContext) === null || _context_ssrContext === void 0 ? void 0 : _context_ssrContext.response.status((_context_routerContext3 = context.routerContext) === null || _context_routerContext3 === void 0 ? void 0 : _context_routerContext3.statusCode);
-    }
-    const errors = Object.values(((_context_routerContext2 = context.routerContext) === null || _context_routerContext2 === void 0 ? void 0 : _context_routerContext2.errors) || {});
-    if (errors.length > 0) {
-      options.onError(errors[0], SSRErrors.LOADER_ERROR);
-    }
-    context.initialData = initialData;
-    const redirectResponse = getRedirectResponse(initialData);
-    if (redirectResponse) {
-      return redirectResponse;
-    }
-    const { htmlTemplate } = options.resource;
-    options.resource.htmlTemplate = htmlTemplate.replace("</head>", `${CHUNK_CSS_PLACEHOLDER}</head>`);
-    const response = await handleRequest(request, Root, {
-      ...options,
-      runtimeContext: context,
-      RSCRoot: (createRequestOptions === null || createRequestOptions === void 0 ? void 0 : createRequestOptions.enableRsc) && getGlobalRSCRoot()
-    });
-    Object.entries(responseProxy.headers).forEach(([key, value]) => {
-      response.headers.set(key, value);
-    });
-    if (responseProxy.code !== -1) {
-      return new Response(response.body, {
-        status: responseProxy.code,
-        headers: response.headers
+      const errors = Object.values(((_context_routerContext2 = context.routerContext) === null || _context_routerContext2 === void 0 ? void 0 : _context_routerContext2.errors) || {});
+      if (errors.length > 0) {
+        options.onError(errors[0], SSRErrors.LOADER_ERROR);
+      }
+      context.initialData = initialData;
+      const redirectResponse = getRedirectResponse(initialData);
+      if (redirectResponse) {
+        return redirectResponse;
+      }
+      const { htmlTemplate } = options.resource;
+      options.resource.htmlTemplate = htmlTemplate.replace("</head>", `${CHUNK_CSS_PLACEHOLDER}</head>`);
+      const response = await handleRequest(request, Root, {
+        ...options,
+        runtimeContext: context,
+        RSCRoot: (createRequestOptions === null || createRequestOptions === void 0 ? void 0 : createRequestOptions.enableRsc) && getGlobalRSCRoot()
+      });
+      Object.entries(responseProxy.headers).forEach(([key, value]) => {
+        response.headers.set(key, value);
       });
-    }
-    return response;
+      if (responseProxy.status !== -1) {
+        return new Response(response.body, {
+          status: responseProxy.status,
+          headers: response.headers
+        });
+      }
+      return response;
+    });
   };
   return requestHandler;
 };

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

@@ -1,7 +1,5 @@
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
-import { run } from "@modern-js/runtime-utils/node";
 import { time } from "@modern-js/runtime-utils/time";
-import { parseHeaders } from "@modern-js/runtime-utils/universal/request";
 import { wrapRuntimeContextProvider } from "../../react/wrapper";
 import { SSRErrors, SSRTimings } from "../tracer";
 import { getSSRConfigByEntry } from "../utils";
@@ -32,51 +30,48 @@ function getReadableStreamFromString(content) {
 function createRenderStreaming(createReadableStreamPromise) {
   return async (request, serverRoot, options) => {
     const createReadableStreamFromElement = await createReadableStreamPromise;
-    const headersData = parseHeaders(request);
-    return run(headersData, async () => {
-      const end = time();
-      const { runtimeContext, config, resource } = options;
-      const { onError, onTiming } = options;
-      const { htmlTemplate, entryName } = resource;
-      const ssrConfig = getSSRConfigByEntry(entryName, config.ssr, config.ssrByEntries);
-      const RSCServerRoot = ({ children }) => {
-        return /* @__PURE__ */ _jsx(_Fragment, {
-          children
-        });
-      };
-      let rootElement = wrapRuntimeContextProvider(serverRoot, Object.assign(runtimeContext, {
-        ssr: true
-      }));
-      rootElement = /* @__PURE__ */ _jsx(RSCServerRoot, {
-        children: rootElement
+    const end = time();
+    const { runtimeContext, config, resource } = options;
+    const { onError, onTiming } = options;
+    const { htmlTemplate, entryName } = resource;
+    const ssrConfig = getSSRConfigByEntry(entryName, config.ssr, config.ssrByEntries);
+    const RSCServerRoot = ({ children }) => {
+      return /* @__PURE__ */ _jsx(_Fragment, {
+        children
       });
-      const stream = await createReadableStreamFromElement(request, rootElement, {
-        config,
-        htmlTemplate,
-        runtimeContext,
-        ssrConfig,
-        entryName,
-        rscClientManifest: options.rscClientManifest,
-        rscSSRManifest: options.rscSSRManifest,
-        rscServerManifest: options.rscServerManifest,
-        rscRoot: options.rscRoot,
-        onShellReady() {
-          const cost = end();
-          onTiming(SSRTimings.RENDER_SHELL, cost);
-        },
-        onAllReady() {
-          const cost = end();
-          onTiming(SSRTimings.RENDER_HTML, cost);
-        },
-        onShellError(error) {
-          onError(error, SSRErrors.RENDER_SHELL);
-        },
-        onError(error) {
-          onError(error, SSRErrors.RENDER_STREAM);
-        }
-      });
-      return stream;
+    };
+    let rootElement = wrapRuntimeContextProvider(serverRoot, Object.assign(runtimeContext, {
+      ssr: true
+    }));
+    rootElement = /* @__PURE__ */ _jsx(RSCServerRoot, {
+      children: rootElement
+    });
+    const stream = await createReadableStreamFromElement(request, rootElement, {
+      config,
+      htmlTemplate,
+      runtimeContext,
+      ssrConfig,
+      entryName,
+      rscClientManifest: options.rscClientManifest,
+      rscSSRManifest: options.rscSSRManifest,
+      rscServerManifest: options.rscServerManifest,
+      rscRoot: options.rscRoot,
+      onShellReady() {
+        const cost = end();
+        onTiming(SSRTimings.RENDER_SHELL, cost);
+      },
+      onAllReady() {
+        const cost = end();
+        onTiming(SSRTimings.RENDER_HTML, cost);
+      },
+      onShellError(error) {
+        onError(error, SSRErrors.RENDER_SHELL);
+      },
+      onError(error) {
+        onError(error, SSRErrors.RENDER_STREAM);
+      }
     });
+    return stream;
   };
 }
 export {