@modern-js/runtime 2.65.0 → 2.65.2

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

@@ -22,75 +22,70 @@ __export(prefetch_exports, {
 });
 module.exports = __toCommonJS(prefetch_exports);
 var import_server = require("@loadable/server");
-var import_node = require("@modern-js/runtime-utils/node");
 var import_time = require("@modern-js/runtime-utils/time");
-var import_request = require("@modern-js/runtime-utils/universal/request");
 var import_server2 = require("react-dom/server");
 var import_wrapper = require("../../react/wrapper");
 var import_tracer = require("../tracer");
 const prefetch = async (App, request, options, ssrConfig, { onError, onTiming }) => {
-  const headersData = (0, import_request.parseHeaders)(request);
+  var _context_store;
   const { runtimeContext: context, resource } = options;
   const { entryName, loadableStats } = resource;
-  return (0, import_node.run)(headersData, async () => {
-    var _context_store;
-    if (typeof ssrConfig === "boolean" || !ssrConfig.disablePrerender) {
-      try {
-        const end = (0, import_time.time)();
-        if (loadableStats) {
-          const extractor = new import_server.ChunkExtractor({
-            stats: loadableStats,
-            entrypoints: [
-              entryName
-            ].filter(Boolean)
-          });
-          (0, import_server2.renderToStaticMarkup)(extractor.collectChunks((0, import_wrapper.wrapRuntimeContextProvider)(App, Object.assign(context, {
-            ssr: false
-          }))));
-        } else {
-          (0, import_server2.renderToStaticMarkup)((0, import_wrapper.wrapRuntimeContextProvider)(App, Object.assign(context, {
-            ssr: false
-          })));
-        }
-        const cost = end();
-        onTiming(import_tracer.SSRTimings.PRERENDER, cost);
-      } catch (e) {
-        const error = e;
-        onError(error, import_tracer.SSRErrors.PRERENDER);
-        throw e;
-      }
-    }
-    if (!context.loaderManager.hasPendingLoaders()) {
-      return {
-        initialData: context.initialData,
-        i18nData: context.__i18nData__
-      };
-    }
-    let loadersData = {};
+  if (typeof ssrConfig === "boolean" || !ssrConfig.disablePrerender) {
     try {
       const end = (0, import_time.time)();
-      loadersData = await context.loaderManager.awaitPendingLoaders();
+      if (loadableStats) {
+        const extractor = new import_server.ChunkExtractor({
+          stats: loadableStats,
+          entrypoints: [
+            entryName
+          ].filter(Boolean)
+        });
+        (0, import_server2.renderToStaticMarkup)(extractor.collectChunks((0, import_wrapper.wrapRuntimeContextProvider)(App, Object.assign(context, {
+          ssr: false
+        }))));
+      } else {
+        (0, import_server2.renderToStaticMarkup)((0, import_wrapper.wrapRuntimeContextProvider)(App, Object.assign(context, {
+          ssr: false
+        })));
+      }
       const cost = end();
-      onTiming(import_tracer.SSRTimings.USE_LOADER, cost);
+      onTiming(import_tracer.SSRTimings.PRERENDER, cost);
     } catch (e) {
-      onError(e, import_tracer.SSRErrors.USE_LOADER);
+      const error = e;
+      onError(error, import_tracer.SSRErrors.PRERENDER);
       throw e;
     }
-    Object.keys(loadersData).forEach((id) => {
-      const data = loadersData[id];
-      if (data._error) {
-        onError(data._error, import_tracer.SSRErrors.USE_LOADER);
-        delete data._error;
-      }
-    });
+  }
+  if (!context.loaderManager.hasPendingLoaders()) {
     return {
-      loadersData,
       initialData: context.initialData,
-      i18nData: context.__i18nData__,
-      // todo: move to plugin state
-      storeState: context === null || context === void 0 ? void 0 : (_context_store = context.store) === null || _context_store === void 0 ? void 0 : _context_store.getState()
+      i18nData: context.__i18nData__
     };
+  }
+  let loadersData = {};
+  try {
+    const end = (0, import_time.time)();
+    loadersData = await context.loaderManager.awaitPendingLoaders();
+    const cost = end();
+    onTiming(import_tracer.SSRTimings.USE_LOADER, cost);
+  } catch (e) {
+    onError(e, import_tracer.SSRErrors.USE_LOADER);
+    throw e;
+  }
+  Object.keys(loadersData).forEach((id) => {
+    const data = loadersData[id];
+    if (data._error) {
+      onError(data._error, import_tracer.SSRErrors.USE_LOADER);
+      delete data._error;
+    }
   });
+  return {
+    loadersData,
+    initialData: context.initialData,
+    i18nData: context.__i18nData__,
+    // todo: move to plugin state
+    storeState: context === null || context === void 0 ? void 0 : (_context_store = context.store) === null || _context_store === void 0 ? void 0 : _context_store.getState()
+  };
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/index.js

@@ -23,12 +23,16 @@ __export(src_exports, {
   createApp: () => import_core.createApp,
   defineConfig: () => import_core.defineConfig,
   defineRuntimeConfig: () => import_core.defineRuntimeConfig,
+  getMonitors: () => import_monitors.getMonitors,
+  getRequest: () => import_request.getRequest,
   isBrowser: () => import_common.isBrowser,
   useLoader: () => import_core.useLoader,
   useRuntimeContext: () => import_core.useRuntimeContext
 });
 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_core = require("./core");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
@@ -37,6 +41,8 @@ var import_core = require("./core");
   createApp,
   defineConfig,
   defineRuntimeConfig,
+  getMonitors,
+  getRequest,
   isBrowser,
   useLoader,
   useRuntimeContext

package/dist/cjs/react-server.js

@@ -0,0 +1,28 @@
+"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 react_server_exports = {};
+__export(react_server_exports, {
+  getRequest: () => import_request.getRequest
+});
+module.exports = __toCommonJS(react_server_exports);
+var import_request = require("./core/context/request");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getRequest
+});

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

@@ -91,8 +91,7 @@ const routerPlugin = (userConfig = {}) => {
           ssrMode,
           props: {
             nonce
-          },
-          reporter
+          }
         }));
         routes = hooks.modifyRoutes.call(routes);
         const { query } = (0, import_remix_router.createStaticHandler)(routes, {

package/dist/cjs/router/runtime/utils.js

@@ -43,7 +43,7 @@ var import_remix_router = require("@modern-js/runtime-utils/remix-router");
 var import_router = require("@modern-js/runtime-utils/router");
 var import_DefaultNotFound = require("./DefaultNotFound");
 var import_DeferredDataScripts = __toESM(require("./DeferredDataScripts"));
-function getRouteComponents(routes, { globalApp, ssrMode, props, reporter }) {
+function getRouteComponents(routes, { globalApp, ssrMode, props }) {
   const Layout = ({ Component, ...props2 }) => {
     const GlobalLayout = globalApp;
     if (!GlobalLayout) {
@@ -61,8 +61,7 @@ function getRouteComponents(routes, { globalApp, ssrMode, props, reporter }) {
     if (route.type === "nested") {
       const routeElement = (0, import_browser.renderNestedRoute)(route, {
         DeferredDataComponent: ssrMode === "stream" ? import_DeferredDataScripts.default : void 0,
-        props,
-        reporter
+        props
       });
       routeElements.push(routeElement);
     } else {
@@ -81,7 +80,7 @@ function getRouteComponents(routes, { globalApp, ssrMode, props, reporter }) {
   }, "*"));
   return routeElements;
 }
-function renderRoutes({ routesConfig, props, ssrMode, reporter }) {
+function renderRoutes({ routesConfig, props, ssrMode }) {
   if (!routesConfig) {
     return null;
   }
@@ -92,8 +91,7 @@ function renderRoutes({ routesConfig, props, ssrMode, reporter }) {
   const routeElements = getRouteComponents(routes, {
     globalApp,
     ssrMode,
-    props,
-    reporter
+    props
   });
   return routeElements;
 }

package/dist/esm/cache/index.js

@@ -0,0 +1 @@
+export * from "@modern-js/runtime-utils/cache";

package/dist/esm/cli/ssr/index.js

@@ -113,7 +113,7 @@ var ssrPlugin = function() {
           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("".concat(path.sep, "cjs").concat(path.sep), "".concat(path.sep, "esm").concat(path.sep))
             }
           },
           tools: {

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

@@ -0,0 +1,40 @@
+var defaultMonitors = {
+  counter: function counter(name) {
+    for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+      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];
+    }
+  },
+  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];
+    }
+  }
+};
+export {
+  defaultMonitors
+};

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

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

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

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

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

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

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

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

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

@@ -5,6 +5,7 @@ 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 { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
+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";
@@ -75,129 +76,142 @@ var createRequestHandler = function() {
     return _ts_generator(this, function(_state) {
       requestHandler = function() {
         var _ref2 = _async_to_generator(function(request, options) {
-          var _context_routerContext, _context_routerContext1, _context_routerContext2, Root, internalRuntimeContext, hooks, routeManifest, context, runBeforeRender, responseProxy, ssrContext, getRedirectResponse, initialData, _context_routerContext3, _context_ssrContext, errors, redirectResponse, htmlTemplate, response;
+          var headersData;
           return _ts_generator(this, function(_state2) {
-            switch (_state2.label) {
-              case 0:
-                Root = createRoot();
-                internalRuntimeContext = getGlobalInternalRuntimeContext();
-                hooks = internalRuntimeContext.hooks;
-                routeManifest = options.resource.routeManifest;
-                context = getInitialContext(false, routeManifest);
-                runBeforeRender = function() {
-                  var _ref3 = _async_to_generator(function(context2) {
-                    var result, init;
-                    return _ts_generator(this, function(_state3) {
-                      switch (_state3.label) {
-                        case 0:
-                          return [
-                            4,
-                            hooks.onBeforeRender.call(context2)
-                          ];
-                        case 1:
-                          result = _state3.sent();
-                          if (typeof Response !== "undefined" && _instanceof(result, Response)) {
-                            return [
-                              2,
-                              result
-                            ];
+            headersData = parseHeaders(request);
+            return [
+              2,
+              storage.run({
+                headers: headersData,
+                request,
+                monitors: options.monitors
+              }, /* @__PURE__ */ _async_to_generator(function() {
+                var _context_routerContext, _context_routerContext1, _context_routerContext2, Root, internalRuntimeContext, hooks, routeManifest, context, runBeforeRender, responseProxy, ssrContext, getRedirectResponse, initialData, _context_routerContext3, _context_ssrContext, errors, redirectResponse, htmlTemplate, response;
+                return _ts_generator(this, function(_state3) {
+                  switch (_state3.label) {
+                    case 0:
+                      Root = createRoot();
+                      internalRuntimeContext = getGlobalInternalRuntimeContext();
+                      hooks = internalRuntimeContext.hooks;
+                      routeManifest = options.resource.routeManifest;
+                      context = getInitialContext(false, routeManifest);
+                      runBeforeRender = function() {
+                        var _ref3 = _async_to_generator(function(context2) {
+                          var result, init;
+                          return _ts_generator(this, function(_state4) {
+                            switch (_state4.label) {
+                              case 0:
+                                return [
+                                  4,
+                                  hooks.onBeforeRender.call(context2)
+                                ];
+                              case 1:
+                                result = _state4.sent();
+                                if (typeof Response !== "undefined" && _instanceof(result, Response)) {
+                                  return [
+                                    2,
+                                    result
+                                  ];
+                                }
+                                init = getGlobalAppInit();
+                                return [
+                                  2,
+                                  init === null || init === void 0 ? void 0 : init(context2)
+                                ];
+                            }
+                          });
+                        });
+                        return function runBeforeRender2(context2) {
+                          return _ref3.apply(this, arguments);
+                        };
+                      }();
+                      responseProxy = {
+                        headers: {},
+                        code: -1
+                      };
+                      ssrContext = createSSRContext(request, _object_spread_props(_object_spread({}, 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
+                        })
+                      });
+                      getRedirectResponse = function(result) {
+                        if (typeof Response !== "undefined" && // fix: ssg workflow doesn't inject Web Response
+                        _instanceof(result, Response) && result.status >= 300 && result.status <= 399) {
+                          var status = result.status;
+                          var redirectUrl = result.headers.get("Location") || "/";
+                          var ssrContext2 = context.ssrContext;
+                          if (ssrContext2) {
+                            return new Response(null, {
+                              status,
+                              headers: {
+                                Location: redirectUrl
+                              }
+                            });
                           }
-                          init = getGlobalAppInit();
-                          return [
-                            2,
-                            init === null || init === void 0 ? void 0 : init(context2)
-                          ];
-                      }
-                    });
-                  });
-                  return function runBeforeRender2(context2) {
-                    return _ref3.apply(this, arguments);
-                  };
-                }();
-                responseProxy = {
-                  headers: {},
-                  code: -1
-                };
-                ssrContext = createSSRContext(request, _object_spread_props(_object_spread({}, 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
-                  })
-                });
-                getRedirectResponse = function(result) {
-                  if (typeof Response !== "undefined" && // fix: ssg workflow doesn't inject Web Response
-                  _instanceof(result, Response) && result.status >= 300 && result.status <= 399) {
-                    var status = result.status;
-                    var redirectUrl = result.headers.get("Location") || "/";
-                    var ssrContext2 = context.ssrContext;
-                    if (ssrContext2) {
-                      return new Response(null, {
-                        status,
-                        headers: {
-                          Location: redirectUrl
                         }
+                        return void 0;
+                      };
+                      return [
+                        4,
+                        runBeforeRender(context)
+                      ];
+                    case 1:
+                      initialData = _state3.sent();
+                      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) {
+                        ;
+                        (_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);
+                      }
+                      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;
+                      redirectResponse = getRedirectResponse(initialData);
+                      if (redirectResponse) {
+                        return [
+                          2,
+                          redirectResponse
+                        ];
+                      }
+                      htmlTemplate = options.resource.htmlTemplate;
+                      options.resource.htmlTemplate = htmlTemplate.replace("</head>", "".concat(CHUNK_CSS_PLACEHOLDER, "</head>"));
+                      return [
+                        4,
+                        handleRequest(request, Root, _object_spread_props(_object_spread({}, options), {
+                          runtimeContext: context,
+                          RSCRoot: (createRequestOptions === null || createRequestOptions === void 0 ? void 0 : createRequestOptions.enableRsc) && getGlobalRSCRoot()
+                        }))
+                      ];
+                    case 2:
+                      response = _state3.sent();
+                      Object.entries(responseProxy.headers).forEach(function(param) {
+                        var _param = _sliced_to_array(param, 2), key = _param[0], value = _param[1];
+                        response.headers.set(key, value);
                       });
-                    }
+                      if (responseProxy.code !== -1) {
+                        return [
+                          2,
+                          new Response(response.body, {
+                            status: responseProxy.code,
+                            headers: response.headers
+                          })
+                        ];
+                      }
+                      return [
+                        2,
+                        response
+                      ];
                   }
-                  return void 0;
-                };
-                return [
-                  4,
-                  runBeforeRender(context)
-                ];
-              case 1:
-                initialData = _state2.sent();
-                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) {
-                  ;
-                  (_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);
-                }
-                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;
-                redirectResponse = getRedirectResponse(initialData);
-                if (redirectResponse) {
-                  return [
-                    2,
-                    redirectResponse
-                  ];
-                }
-                htmlTemplate = options.resource.htmlTemplate;
-                options.resource.htmlTemplate = htmlTemplate.replace("</head>", "".concat(CHUNK_CSS_PLACEHOLDER, "</head>"));
-                return [
-                  4,
-                  handleRequest(request, Root, _object_spread_props(_object_spread({}, options), {
-                    runtimeContext: context,
-                    RSCRoot: (createRequestOptions === null || createRequestOptions === void 0 ? void 0 : createRequestOptions.enableRsc) && getGlobalRSCRoot()
-                  }))
-                ];
-              case 2:
-                response = _state2.sent();
-                Object.entries(responseProxy.headers).forEach(function(param) {
-                  var _param = _sliced_to_array(param, 2), key = _param[0], value = _param[1];
-                  response.headers.set(key, value);
                 });
-                if (responseProxy.code !== -1) {
-                  return [
-                    2,
-                    new Response(response.body, {
-                      status: responseProxy.code,
-                      headers: response.headers
-                    })
-                  ];
-                }
-                return [
-                  2,
-                  response
-                ];
-            }
+              }))
+            ];
           });
         });
         return function requestHandler2(request, options) {