@modern-js/runtime-utils 0.0.0-nightly-20250225160325 → 0.0.0-nightly-20250226085424

package/dist/cjs/browser/nestedRoutes.js

@@ -27,12 +27,11 @@ var import_constants = require("@modern-js/utils/universal/constants");
 var import_react = require("react");
 var import_react_router_dom = require("react-router-dom");
 var import_time = require("../time");
-const transformNestedRoutes = (routes, reporter) => {
+var import_async_storage = require("../universal/async_storage");
+const transformNestedRoutes = (routes) => {
   const routeElements = [];
   for (const route of routes) {
-    const routeElement = renderNestedRoute(route, {
-      reporter
-    });
+    const routeElement = renderNestedRoute(route);
     routeElements.push(routeElement);
   }
   return (0, import_react_router_dom.createRoutesFromElements)(routeElements);
@@ -40,12 +39,12 @@ const transformNestedRoutes = (routes, reporter) => {
 const renderNestedRoute = (nestedRoute, options = {}) => {
   const { children, index, id, component, isRoot, lazyImport, config, handle } = nestedRoute;
   const Component = component;
-  const { parent, props = {}, reporter } = options;
+  const { parent, props = {} } = options;
   const routeProps = {
     caseSensitive: nestedRoute.caseSensitive,
     path: nestedRoute.path,
     id: nestedRoute.id,
-    loader: createLoader(nestedRoute, reporter),
+    loader: createLoader(nestedRoute),
     action: nestedRoute.action,
     hasErrorBoundary: nestedRoute.hasErrorBoundary,
     shouldRevalidate: nestedRoute.shouldRevalidate,
@@ -98,8 +97,7 @@ const renderNestedRoute = (nestedRoute, options = {}) => {
   }
   const childElements = children === null || children === void 0 ? void 0 : children.map((childRoute) => {
     return renderNestedRoute(childRoute, {
-      parent: nestedRoute,
-      reporter
+      parent: nestedRoute
     });
   });
   const routeElement = index ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.Route, {
@@ -112,7 +110,7 @@ const renderNestedRoute = (nestedRoute, options = {}) => {
   }, id);
   return routeElement;
 };
-function createLoader(route, reporter) {
+function createLoader(route) {
   const { loader } = route;
   if (loader) {
     return async (args) => {
@@ -122,8 +120,10 @@ function createLoader(route, reporter) {
       const end = (0, import_time.time)();
       const res = await loader(args);
       const cost = end();
-      if (typeof document === "undefined" && reporter) {
-        reporter === null || reporter === void 0 ? void 0 : reporter.reportTiming(`${import_constants.LOADER_REPORTER_NAME}-${route.id}`, cost);
+      if (typeof document === "undefined") {
+        var _storage_useContext_monitors;
+        const storage = (0, import_async_storage.getAsyncLocalStorage)();
+        storage === null || storage === void 0 ? void 0 : (_storage_useContext_monitors = storage.useContext().monitors) === null || _storage_useContext_monitors === void 0 ? void 0 : _storage_useContext_monitors.timing(`${import_constants.LOADER_REPORTER_NAME}-${route.id}`, cost);
       }
       return res;
     };

package/dist/cjs/node/index.js

@@ -20,10 +20,10 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var node_exports = {};
 __export(node_exports, {
   serializeJson: () => import_serialize.serializeJson,
-  storage: () => import_storage.storage
+  storage: () => import_async_storage.storage
 });
 module.exports = __toCommonJS(node_exports);
-var import_storage = require("./storage");
+var import_async_storage = require("../universal/async_storage.server");
 var import_serialize = require("./serialize");
 __reExport(node_exports, require("./loaderContext"), module.exports);
 __reExport(node_exports, require("./stream"), module.exports);

package/dist/cjs/universal/async_storage.js

@@ -21,8 +21,9 @@ __export(async_storage_exports, {
   getAsyncLocalStorage: () => getAsyncLocalStorage
 });
 module.exports = __toCommonJS(async_storage_exports);
-const getAsyncLocalStorage = async () => {
-  return Promise.resolve(null);
+const getAsyncLocalStorage = () => {
+  console.error("You should not get async storage in browser");
+  return null;
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/universal/async_storage.server.js

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -15,17 +17,64 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var async_storage_server_exports = {};
 __export(async_storage_server_exports, {
-  getAsyncLocalStorage: () => getAsyncLocalStorage
+  getAsyncLocalStorage: () => getAsyncLocalStorage,
+  storage: () => storage
 });
 module.exports = __toCommonJS(async_storage_server_exports);
-var import_storage = require("../node/storage");
-const getAsyncLocalStorage = async () => {
-  return import_storage.storage;
+var ah = __toESM(require("async_hooks"));
+const createStorage = () => {
+  let storage2;
+  if (typeof ah.AsyncLocalStorage !== "undefined") {
+    storage2 = new ah.AsyncLocalStorage();
+  }
+  const run = (context, cb) => {
+    if (!storage2) {
+      throw new Error(`Unable to use async_hook, please confirm the node version >= 12.17
+        `);
+    }
+    return new Promise((resolve, reject) => {
+      storage2.run(context, () => {
+        try {
+          return resolve(cb());
+        } catch (error) {
+          return reject(error);
+        }
+      });
+    });
+  };
+  const useContext = () => {
+    if (!storage2) {
+      throw new Error(`Unable to use async_hook, please confirm the node version >= 12.17
+        `);
+    }
+    const context = storage2 === null || storage2 === void 0 ? void 0 : storage2.getStore();
+    if (!context) {
+      throw new Error(`Can't call useContext out of scope, make sure @modern-js/runtime-utils is a single version in node_modules`);
+    }
+    return context;
+  };
+  return {
+    run,
+    useContext
+  };
+};
+const storage = createStorage();
+const getAsyncLocalStorage = () => {
+  return storage;
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getAsyncLocalStorage
+  getAsyncLocalStorage,
+  storage
 });

package/dist/cjs/universal/cache.js

@@ -133,9 +133,9 @@ function cache(fn, options) {
   tags.forEach((t) => addTagFnRelation(t, fn));
   return async (...args) => {
     if (isServer && typeof options === "undefined") {
-      var _asyncLocalStorage_useContext;
-      const asyncLocalStorage = await (0, import_async_storage.getAsyncLocalStorage)();
-      const request = asyncLocalStorage === null || asyncLocalStorage === void 0 ? void 0 : (_asyncLocalStorage_useContext = asyncLocalStorage.useContext()) === null || _asyncLocalStorage_useContext === void 0 ? void 0 : _asyncLocalStorage_useContext.request;
+      var _storage_useContext;
+      const storage = (0, import_async_storage.getAsyncLocalStorage)();
+      const request = storage === null || storage === void 0 ? void 0 : (_storage_useContext = storage.useContext()) === null || _storage_useContext === void 0 ? void 0 : _storage_useContext.request;
       if (request) {
         let requestCache = requestCacheMap.get(request);
         if (!requestCache) {
@@ -169,7 +169,7 @@ function cache(fn, options) {
         if (age < maxAge) {
           return cached.data;
         }
-        if (revalidate > 0 && age < maxAge + revalidate * 1e3) {
+        if (revalidate > 0 && age < maxAge + revalidate) {
           if (!cached.isRevalidating) {
             cached.isRevalidating = true;
             Promise.resolve().then(async () => {
@@ -184,9 +184,9 @@ function cache(fn, options) {
               } catch (error) {
                 cached.isRevalidating = false;
                 if (isServer) {
-                  var _asyncLocalStorage_useContext_monitors, _asyncLocalStorage_useContext2;
-                  const asyncLocalStorage = await (0, import_async_storage.getAsyncLocalStorage)();
-                  asyncLocalStorage === null || asyncLocalStorage === void 0 ? void 0 : (_asyncLocalStorage_useContext2 = asyncLocalStorage.useContext()) === null || _asyncLocalStorage_useContext2 === void 0 ? void 0 : (_asyncLocalStorage_useContext_monitors = _asyncLocalStorage_useContext2.monitors) === null || _asyncLocalStorage_useContext_monitors === void 0 ? void 0 : _asyncLocalStorage_useContext_monitors.error(error.message);
+                  var _storage_useContext_monitors, _storage_useContext2;
+                  const storage = (0, import_async_storage.getAsyncLocalStorage)();
+                  storage === null || storage === void 0 ? void 0 : (_storage_useContext2 = storage.useContext()) === null || _storage_useContext2 === void 0 ? void 0 : (_storage_useContext_monitors = _storage_useContext2.monitors) === null || _storage_useContext_monitors === void 0 ? void 0 : _storage_useContext_monitors.error(error.message);
                 } else {
                   console.error("Background revalidation failed:", error);
                 }
@@ -205,7 +205,7 @@ function cache(fn, options) {
       store.set(fn, tagCache);
       return data;
     } else {
-      console.warn("The cache function will not work because it runs on the client and there are no options are provided.");
+      console.warn("The cache function will not work because it runs on the browser and there are no options are provided.");
       return fn(...args);
     }
   };
@@ -215,8 +215,8 @@ function withRequestCache(handler) {
     return handler;
   }
   return async (req, ...args) => {
-    const asyncLocalStorage = await (0, import_async_storage.getAsyncLocalStorage)();
-    return asyncLocalStorage.run({
+    const storage = (0, import_async_storage.getAsyncLocalStorage)();
+    return storage.run({
       request: req
     }, () => handler(req, ...args));
   };

package/dist/esm/browser/nestedRoutes.js

@@ -8,15 +8,14 @@ import { LOADER_REPORTER_NAME } from "@modern-js/utils/universal/constants";
 import { Suspense } from "react";
 import { Outlet, Route, createRoutesFromElements } from "react-router-dom";
 import { time } from "../time";
-var transformNestedRoutes = function(routes, reporter) {
+import { getAsyncLocalStorage } from "../universal/async_storage";
+var transformNestedRoutes = function(routes) {
   var routeElements = [];
   var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
   try {
     for (var _iterator = routes[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
       var route = _step.value;
-      var routeElement = renderNestedRoute(route, {
-        reporter
-      });
+      var routeElement = renderNestedRoute(route);
       routeElements.push(routeElement);
     }
   } catch (err) {
@@ -39,12 +38,12 @@ var renderNestedRoute = function(nestedRoute) {
   var options = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
   var children = nestedRoute.children, index = nestedRoute.index, id = nestedRoute.id, component = nestedRoute.component, isRoot = nestedRoute.isRoot, lazyImport = nestedRoute.lazyImport, config = nestedRoute.config, handle = nestedRoute.handle;
   var Component = component;
-  var parent = options.parent, _options_props = options.props, props = _options_props === void 0 ? {} : _options_props, reporter = options.reporter;
+  var parent = options.parent, _options_props = options.props, props = _options_props === void 0 ? {} : _options_props;
   var routeProps = {
     caseSensitive: nestedRoute.caseSensitive,
     path: nestedRoute.path,
     id: nestedRoute.id,
-    loader: createLoader(nestedRoute, reporter),
+    loader: createLoader(nestedRoute),
     action: nestedRoute.action,
     hasErrorBoundary: nestedRoute.hasErrorBoundary,
     shouldRevalidate: nestedRoute.shouldRevalidate,
@@ -92,8 +91,7 @@ var renderNestedRoute = function(nestedRoute) {
   }
   var childElements = children === null || children === void 0 ? void 0 : children.map(function(childRoute) {
     return renderNestedRoute(childRoute, {
-      parent: nestedRoute,
-      reporter
+      parent: nestedRoute
     });
   });
   var routeElement = index ? /* @__PURE__ */ _jsx(Route, _object_spread_props(_object_spread({}, routeProps), {
@@ -104,12 +102,12 @@ var renderNestedRoute = function(nestedRoute) {
   }), id);
   return routeElement;
 };
-function createLoader(route, reporter) {
+function createLoader(route) {
   var loader = route.loader;
   if (loader) {
     return function() {
       var _ref = _async_to_generator(function(args) {
-        var end, res, cost;
+        var end, res, cost, _storage_useContext_monitors, storage;
         return _ts_generator(this, function(_state) {
           switch (_state.label) {
             case 0:
@@ -124,8 +122,10 @@ function createLoader(route, reporter) {
             case 1:
               res = _state.sent();
               cost = end();
-              if (typeof document === "undefined" && reporter) {
-                reporter === null || reporter === void 0 ? void 0 : reporter.reportTiming("".concat(LOADER_REPORTER_NAME, "-").concat(route.id), cost);
+              if (typeof document === "undefined") {
+                ;
+                storage = getAsyncLocalStorage();
+                storage === null || storage === void 0 ? void 0 : (_storage_useContext_monitors = storage.useContext().monitors) === null || _storage_useContext_monitors === void 0 ? void 0 : _storage_useContext_monitors.timing("".concat(LOADER_REPORTER_NAME, "-").concat(route.id), cost);
               }
               return [
                 2,

package/dist/esm/node/index.js

@@ -1,4 +1,4 @@
-import { storage } from "./storage";
+import { storage } from "../universal/async_storage.server";
 import { serializeJson } from "./serialize";
 export * from "./loaderContext";
 export * from "./stream";

package/dist/esm/universal/async_storage.js

@@ -1,18 +1,7 @@
-import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
-import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 var getAsyncLocalStorage = function() {
-  var _ref = _async_to_generator(function() {
-    return _ts_generator(this, function(_state) {
-      return [
-        2,
-        Promise.resolve(null)
-      ];
-    });
-  });
-  return function getAsyncLocalStorage2() {
-    return _ref.apply(this, arguments);
-  };
-}();
+  console.error("You should not get async storage in browser");
+  return null;
+};
 export {
   getAsyncLocalStorage
 };

package/dist/esm/universal/async_storage.server.js

@@ -1,19 +1,43 @@
-import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
-import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { storage } from "../node/storage";
-var getAsyncLocalStorage = function() {
-  var _ref = _async_to_generator(function() {
-    return _ts_generator(this, function(_state) {
-      return [
-        2,
-        storage
-      ];
+import * as ah from "async_hooks";
+var createStorage = function() {
+  var storage2;
+  if (typeof ah.AsyncLocalStorage !== "undefined") {
+    storage2 = new ah.AsyncLocalStorage();
+  }
+  var run = function(context, cb) {
+    if (!storage2) {
+      throw new Error("Unable to use async_hook, please confirm the node version >= 12.17\n        ");
+    }
+    return new Promise(function(resolve, reject) {
+      storage2.run(context, function() {
+        try {
+          return resolve(cb());
+        } catch (error) {
+          return reject(error);
+        }
+      });
     });
-  });
-  return function getAsyncLocalStorage2() {
-    return _ref.apply(this, arguments);
   };
-}();
+  var useContext = function() {
+    if (!storage2) {
+      throw new Error("Unable to use async_hook, please confirm the node version >= 12.17\n        ");
+    }
+    var context = storage2 === null || storage2 === void 0 ? void 0 : storage2.getStore();
+    if (!context) {
+      throw new Error("Can't call useContext out of scope, make sure @modern-js/runtime-utils is a single version in node_modules");
+    }
+    return context;
+  };
+  return {
+    run,
+    useContext
+  };
+};
+var storage = createStorage();
+var getAsyncLocalStorage = function() {
+  return storage;
+};
 export {
-  getAsyncLocalStorage
+  getAsyncLocalStorage,
+  storage
 };

package/dist/esm/universal/cache.js

@@ -130,7 +130,7 @@ function cache(fn, options) {
     return addTagFnRelation(t, fn);
   });
   return /* @__PURE__ */ _async_to_generator(function() {
-    var _len, args, _key, _asyncLocalStorage_useContext, asyncLocalStorage, request, requestCache, key, promise, data, error, tagCache, key1, cached, now, age, data1;
+    var _len, args, _key, _storage_useContext, storage, request, requestCache, key, promise, data, error, tagCache, key1, cached, now, age, data1;
     var _arguments = arguments;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
@@ -141,19 +141,14 @@ function cache(fn, options) {
           if (!(isServer && typeof options === "undefined"))
             return [
               3,
-              6
+              5
             ];
-          return [
-            4,
-            getAsyncLocalStorage()
-          ];
-        case 1:
-          asyncLocalStorage = _state.sent();
-          request = asyncLocalStorage === null || asyncLocalStorage === void 0 ? void 0 : (_asyncLocalStorage_useContext = asyncLocalStorage.useContext()) === null || _asyncLocalStorage_useContext === void 0 ? void 0 : _asyncLocalStorage_useContext.request;
+          storage = getAsyncLocalStorage();
+          request = storage === null || storage === void 0 ? void 0 : (_storage_useContext = storage.useContext()) === null || _storage_useContext === void 0 ? void 0 : _storage_useContext.request;
           if (!request)
             return [
               3,
-              5
+              4
             ];
           requestCache = requestCacheMap.get(request);
           if (!requestCache) {
@@ -169,38 +164,38 @@ function cache(fn, options) {
           }
           promise = fn.apply(void 0, _to_consumable_array(args));
           requestCache.set(key, promise);
-          _state.label = 2;
-        case 2:
+          _state.label = 1;
+        case 1:
           _state.trys.push([
-            2,
-            4,
+            1,
+            3,
             ,
-            5
+            4
           ]);
           return [
             4,
             promise
           ];
-        case 3:
+        case 2:
           data = _state.sent();
           return [
             2,
             data
           ];
-        case 4:
+        case 3:
           error = _state.sent();
           requestCache.delete(key);
           throw error;
-        case 5:
+        case 4:
           return [
             3,
-            9
+            8
           ];
-        case 6:
+        case 5:
           if (!(typeof options !== "undefined"))
             return [
               3,
-              8
+              7
             ];
           tagCache = store.get(fn);
           if (!tagCache) {
@@ -217,11 +212,11 @@ function cache(fn, options) {
                 cached.data
               ];
             }
-            if (revalidate > 0 && age < maxAge + revalidate * 1e3) {
+            if (revalidate > 0 && age < maxAge + revalidate) {
               if (!cached.isRevalidating) {
                 cached.isRevalidating = true;
                 Promise.resolve().then(/* @__PURE__ */ _async_to_generator(function() {
-                  var newData, error2, _asyncLocalStorage_useContext_monitors, _asyncLocalStorage_useContext2, asyncLocalStorage2;
+                  var newData, error2, _storage_useContext_monitors, _storage_useContext2, storage2;
                   return _ts_generator(this, function(_state2) {
                     switch (_state2.label) {
                       case 0:
@@ -229,7 +224,7 @@ function cache(fn, options) {
                           0,
                           2,
                           ,
-                          6
+                          3
                         ]);
                         return [
                           4,
@@ -245,36 +240,23 @@ function cache(fn, options) {
                         store.set(fn, tagCache);
                         return [
                           3,
-                          6
+                          3
                         ];
                       case 2:
                         error2 = _state2.sent();
                         cached.isRevalidating = false;
-                        if (!isServer)
-                          return [
-                            3,
-                            4
-                          ];
-                        return [
-                          4,
-                          getAsyncLocalStorage()
-                        ];
-                      case 3:
-                        asyncLocalStorage2 = _state2.sent();
-                        asyncLocalStorage2 === null || asyncLocalStorage2 === void 0 ? void 0 : (_asyncLocalStorage_useContext2 = asyncLocalStorage2.useContext()) === null || _asyncLocalStorage_useContext2 === void 0 ? void 0 : (_asyncLocalStorage_useContext_monitors = _asyncLocalStorage_useContext2.monitors) === null || _asyncLocalStorage_useContext_monitors === void 0 ? void 0 : _asyncLocalStorage_useContext_monitors.error(error2.message);
-                        return [
-                          3,
-                          5
-                        ];
-                      case 4:
-                        console.error("Background revalidation failed:", error2);
-                        _state2.label = 5;
-                      case 5:
+                        if (isServer) {
+                          ;
+                          storage2 = getAsyncLocalStorage();
+                          storage2 === null || storage2 === void 0 ? void 0 : (_storage_useContext2 = storage2.useContext()) === null || _storage_useContext2 === void 0 ? void 0 : (_storage_useContext_monitors = _storage_useContext2.monitors) === null || _storage_useContext_monitors === void 0 ? void 0 : _storage_useContext_monitors.error(error2.message);
+                        } else {
+                          console.error("Background revalidation failed:", error2);
+                        }
                         return [
                           3,
-                          6
+                          3
                         ];
-                      case 6:
+                      case 3:
                         return [
                           2
                         ];
@@ -292,7 +274,7 @@ function cache(fn, options) {
             4,
             fn.apply(void 0, _to_consumable_array(args))
           ];
-        case 7:
+        case 6:
           data1 = _state.sent();
           tagCache.set(key1, {
             data: data1,
@@ -304,13 +286,13 @@ function cache(fn, options) {
             2,
             data1
           ];
-        case 8:
-          console.warn("The cache function will not work because it runs on the client and there are no options are provided.");
+        case 7:
+          console.warn("The cache function will not work because it runs on the browser and there are no options are provided.");
           return [
             2,
             fn.apply(void 0, _to_consumable_array(args))
           ];
-        case 9:
+        case 8:
           return [
             2
           ];
@@ -324,31 +306,23 @@ function withRequestCache(handler) {
   }
   return function() {
     var _ref = _async_to_generator(function(req) {
-      var _len, args, _key, asyncLocalStorage;
+      var _len, args, _key, storage;
       var _arguments = arguments;
       return _ts_generator(this, function(_state) {
-        switch (_state.label) {
-          case 0:
-            for (_len = _arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-              args[_key - 1] = _arguments[_key];
-            }
-            return [
-              4,
-              getAsyncLocalStorage()
-            ];
-          case 1:
-            asyncLocalStorage = _state.sent();
-            return [
-              2,
-              asyncLocalStorage.run({
-                request: req
-              }, function() {
-                return handler.apply(void 0, [
-                  req
-                ].concat(_to_consumable_array(args)));
-              })
-            ];
+        for (_len = _arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+          args[_key - 1] = _arguments[_key];
         }
+        storage = getAsyncLocalStorage();
+        return [
+          2,
+          storage.run({
+            request: req
+          }, function() {
+            return handler.apply(void 0, [
+              req
+            ].concat(_to_consumable_array(args)));
+          })
+        ];
       });
     });
     return function(req) {

package/dist/esm-node/browser/nestedRoutes.js

@@ -3,12 +3,11 @@ import { LOADER_REPORTER_NAME } from "@modern-js/utils/universal/constants";
 import { Suspense } from "react";
 import { Outlet, Route, createRoutesFromElements } from "react-router-dom";
 import { time } from "../time";
-const transformNestedRoutes = (routes, reporter) => {
+import { getAsyncLocalStorage } from "../universal/async_storage";
+const transformNestedRoutes = (routes) => {
   const routeElements = [];
   for (const route of routes) {
-    const routeElement = renderNestedRoute(route, {
-      reporter
-    });
+    const routeElement = renderNestedRoute(route);
     routeElements.push(routeElement);
   }
   return createRoutesFromElements(routeElements);
@@ -16,12 +15,12 @@ const transformNestedRoutes = (routes, reporter) => {
 const renderNestedRoute = (nestedRoute, options = {}) => {
   const { children, index, id, component, isRoot, lazyImport, config, handle } = nestedRoute;
   const Component = component;
-  const { parent, props = {}, reporter } = options;
+  const { parent, props = {} } = options;
   const routeProps = {
     caseSensitive: nestedRoute.caseSensitive,
     path: nestedRoute.path,
     id: nestedRoute.id,
-    loader: createLoader(nestedRoute, reporter),
+    loader: createLoader(nestedRoute),
     action: nestedRoute.action,
     hasErrorBoundary: nestedRoute.hasErrorBoundary,
     shouldRevalidate: nestedRoute.shouldRevalidate,
@@ -74,8 +73,7 @@ const renderNestedRoute = (nestedRoute, options = {}) => {
   }
   const childElements = children === null || children === void 0 ? void 0 : children.map((childRoute) => {
     return renderNestedRoute(childRoute, {
-      parent: nestedRoute,
-      reporter
+      parent: nestedRoute
     });
   });
   const routeElement = index ? /* @__PURE__ */ _jsx(Route, {
@@ -88,7 +86,7 @@ const renderNestedRoute = (nestedRoute, options = {}) => {
   }, id);
   return routeElement;
 };
-function createLoader(route, reporter) {
+function createLoader(route) {
   const { loader } = route;
   if (loader) {
     return async (args) => {
@@ -98,8 +96,10 @@ function createLoader(route, reporter) {
       const end = time();
       const res = await loader(args);
       const cost = end();
-      if (typeof document === "undefined" && reporter) {
-        reporter === null || reporter === void 0 ? void 0 : reporter.reportTiming(`${LOADER_REPORTER_NAME}-${route.id}`, cost);
+      if (typeof document === "undefined") {
+        var _storage_useContext_monitors;
+        const storage = getAsyncLocalStorage();
+        storage === null || storage === void 0 ? void 0 : (_storage_useContext_monitors = storage.useContext().monitors) === null || _storage_useContext_monitors === void 0 ? void 0 : _storage_useContext_monitors.timing(`${LOADER_REPORTER_NAME}-${route.id}`, cost);
       }
       return res;
     };

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

@@ -1,4 +1,4 @@
-import { storage } from "./storage";
+import { storage } from "../universal/async_storage.server";
 import { serializeJson } from "./serialize";
 export * from "./loaderContext";
 export * from "./stream";

package/dist/esm-node/universal/async_storage.js

@@ -1,5 +1,6 @@
-const getAsyncLocalStorage = async () => {
-  return Promise.resolve(null);
+const getAsyncLocalStorage = () => {
+  console.error("You should not get async storage in browser");
+  return null;
 };
 export {
   getAsyncLocalStorage

package/dist/esm-node/universal/async_storage.server.js

@@ -1,7 +1,45 @@
-import { storage } from "../node/storage";
-const getAsyncLocalStorage = async () => {
+import * as ah from "async_hooks";
+const createStorage = () => {
+  let storage2;
+  if (typeof ah.AsyncLocalStorage !== "undefined") {
+    storage2 = new ah.AsyncLocalStorage();
+  }
+  const run = (context, cb) => {
+    if (!storage2) {
+      throw new Error(`Unable to use async_hook, please confirm the node version >= 12.17
+        `);
+    }
+    return new Promise((resolve, reject) => {
+      storage2.run(context, () => {
+        try {
+          return resolve(cb());
+        } catch (error) {
+          return reject(error);
+        }
+      });
+    });
+  };
+  const useContext = () => {
+    if (!storage2) {
+      throw new Error(`Unable to use async_hook, please confirm the node version >= 12.17
+        `);
+    }
+    const context = storage2 === null || storage2 === void 0 ? void 0 : storage2.getStore();
+    if (!context) {
+      throw new Error(`Can't call useContext out of scope, make sure @modern-js/runtime-utils is a single version in node_modules`);
+    }
+    return context;
+  };
+  return {
+    run,
+    useContext
+  };
+};
+const storage = createStorage();
+const getAsyncLocalStorage = () => {
   return storage;
 };
 export {
-  getAsyncLocalStorage
+  getAsyncLocalStorage,
+  storage
 };

package/dist/esm-node/universal/cache.js

@@ -103,9 +103,9 @@ function cache(fn, options) {
   tags.forEach((t) => addTagFnRelation(t, fn));
   return async (...args) => {
     if (isServer && typeof options === "undefined") {
-      var _asyncLocalStorage_useContext;
-      const asyncLocalStorage = await getAsyncLocalStorage();
-      const request = asyncLocalStorage === null || asyncLocalStorage === void 0 ? void 0 : (_asyncLocalStorage_useContext = asyncLocalStorage.useContext()) === null || _asyncLocalStorage_useContext === void 0 ? void 0 : _asyncLocalStorage_useContext.request;
+      var _storage_useContext;
+      const storage = getAsyncLocalStorage();
+      const request = storage === null || storage === void 0 ? void 0 : (_storage_useContext = storage.useContext()) === null || _storage_useContext === void 0 ? void 0 : _storage_useContext.request;
       if (request) {
         let requestCache = requestCacheMap.get(request);
         if (!requestCache) {
@@ -139,7 +139,7 @@ function cache(fn, options) {
         if (age < maxAge) {
           return cached.data;
         }
-        if (revalidate > 0 && age < maxAge + revalidate * 1e3) {
+        if (revalidate > 0 && age < maxAge + revalidate) {
           if (!cached.isRevalidating) {
             cached.isRevalidating = true;
             Promise.resolve().then(async () => {
@@ -154,9 +154,9 @@ function cache(fn, options) {
               } catch (error) {
                 cached.isRevalidating = false;
                 if (isServer) {
-                  var _asyncLocalStorage_useContext_monitors, _asyncLocalStorage_useContext2;
-                  const asyncLocalStorage = await getAsyncLocalStorage();
-                  asyncLocalStorage === null || asyncLocalStorage === void 0 ? void 0 : (_asyncLocalStorage_useContext2 = asyncLocalStorage.useContext()) === null || _asyncLocalStorage_useContext2 === void 0 ? void 0 : (_asyncLocalStorage_useContext_monitors = _asyncLocalStorage_useContext2.monitors) === null || _asyncLocalStorage_useContext_monitors === void 0 ? void 0 : _asyncLocalStorage_useContext_monitors.error(error.message);
+                  var _storage_useContext_monitors, _storage_useContext2;
+                  const storage = getAsyncLocalStorage();
+                  storage === null || storage === void 0 ? void 0 : (_storage_useContext2 = storage.useContext()) === null || _storage_useContext2 === void 0 ? void 0 : (_storage_useContext_monitors = _storage_useContext2.monitors) === null || _storage_useContext_monitors === void 0 ? void 0 : _storage_useContext_monitors.error(error.message);
                 } else {
                   console.error("Background revalidation failed:", error);
                 }
@@ -175,7 +175,7 @@ function cache(fn, options) {
       store.set(fn, tagCache);
       return data;
     } else {
-      console.warn("The cache function will not work because it runs on the client and there are no options are provided.");
+      console.warn("The cache function will not work because it runs on the browser and there are no options are provided.");
       return fn(...args);
     }
   };
@@ -185,8 +185,8 @@ function withRequestCache(handler) {
     return handler;
   }
   return async (req, ...args) => {
-    const asyncLocalStorage = await getAsyncLocalStorage();
-    return asyncLocalStorage.run({
+    const storage = getAsyncLocalStorage();
+    return storage.run({
       request: req
     }, () => handler(req, ...args));
   };

package/dist/types/browser/nestedRoutes.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
-import type { NestedRoute, Reporter } from '@modern-js/types';
-export declare const transformNestedRoutes: (routes: NestedRoute[], reporter?: Reporter) => import("react-router-dom").RouteObject[];
+import type { NestedRoute } from '@modern-js/types';
+export declare const transformNestedRoutes: (routes: NestedRoute[]) => import("react-router-dom").RouteObject[];
 type DeferredDataComponentType = (props?: {
     nonce?: string;
 }) => JSX.Element | null;
@@ -8,6 +8,5 @@ export declare const renderNestedRoute: (nestedRoute: NestedRoute, options?: {
     parent?: NestedRoute;
     DeferredDataComponent?: DeferredDataComponentType;
     props?: Record<string, any>;
-    reporter?: Reporter;
 }) => import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/types/node/index.d.ts

@@ -1,7 +1,7 @@
 /**
  * ssr helpers
  */
-export { storage } from './storage';
+export { storage } from '../universal/async_storage.server';
 export { serializeJson } from './serialize';
 export * from './loaderContext';
 export * from './stream';

package/dist/types/server/nestedRoutes.d.ts

@@ -1,3 +1,2 @@
-import type { ModernServerContext, ServerRoute } from '@modern-js/types';
-export type ServerContext = Pick<ModernServerContext, 'logger' | 'req' | 'reporter' | 'res' | 'params' | 'headers' | 'method' | 'url' | 'host' | 'protocol' | 'origin' | 'href' | 'path' | 'query'>;
+import type { ServerRoute } from '@modern-js/types';
 export declare const matchEntry: (pathname: string, entries: ServerRoute[]) => ServerRoute | undefined;

package/dist/types/universal/async_storage.d.ts

@@ -1,2 +1,2 @@
-import type { storage } from '../node/storage';
-export declare const getAsyncLocalStorage: () => Promise<typeof storage | null>;
+import type { Storage } from './async_storage.server';
+export declare const getAsyncLocalStorage: () => Storage | null;

package/dist/types/universal/async_storage.server.d.ts

@@ -1,2 +1,18 @@
-import { storage } from '../node/storage';
-export declare const getAsyncLocalStorage: () => Promise<typeof storage | null>;
+/// <reference types="node" />
+import type { IncomingHttpHeaders } from 'http';
+import type { Monitors } from '@modern-js/types';
+declare const storage: {
+    run: <O>(context: {
+        monitors?: Monitors | undefined;
+        headers?: IncomingHttpHeaders | undefined;
+        request?: Request | undefined;
+    }, cb: () => O | Promise<O>) => Promise<O>;
+    useContext: () => {
+        monitors?: Monitors | undefined;
+        headers?: IncomingHttpHeaders | undefined;
+        request?: Request | undefined;
+    };
+};
+type Storage = typeof storage;
+export { storage, type Storage };
+export declare const getAsyncLocalStorage: () => Storage;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "0.0.0-nightly-20250225160325",
+  "version": "0.0.0-nightly-20250226085424",
   "_comment": "Provide ESM and CJS exports, ESM is used by runtime package, for treeshaking",
   "exports": {
     "./router": {
@@ -146,8 +146,8 @@
     "lru-cache": "^11.0.2",
     "react-router-dom": "6.27.0",
     "serialize-javascript": "^6.0.0",
-    "@modern-js/types": "0.0.0-nightly-20250225160325",
-    "@modern-js/utils": "0.0.0-nightly-20250225160325"
+    "@modern-js/types": "0.0.0-nightly-20250226085424",
+    "@modern-js/utils": "0.0.0-nightly-20250226085424"
   },
   "peerDependencies": {
     "react": ">=17.0.0",
@@ -169,8 +169,8 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "typescript": "^5",
-    "@scripts/build": "0.0.0-nightly-20250225160325",
-    "@scripts/jest-config": "0.0.0-nightly-20250225160325"
+    "@scripts/build": "0.0.0-nightly-20250226085424",
+    "@scripts/jest-config": "0.0.0-nightly-20250226085424"
   },
   "sideEffects": false,
   "scripts": {

package/dist/cjs/node/storage.js

@@ -1,75 +0,0 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var storage_exports = {};
-__export(storage_exports, {
-  storage: () => storage
-});
-module.exports = __toCommonJS(storage_exports);
-var ah = __toESM(require("async_hooks"));
-const createStorage = () => {
-  let storage2;
-  if (typeof ah.AsyncLocalStorage !== "undefined") {
-    storage2 = new ah.AsyncLocalStorage();
-  }
-  const run = (context, cb) => {
-    if (!storage2) {
-      throw new Error(`Unable to use async_hook, please confirm the node version >= 12.17
-        `);
-    }
-    return new Promise((resolve, reject) => {
-      storage2.run(context, () => {
-        try {
-          return resolve(cb());
-        } catch (error) {
-          return reject(error);
-        }
-      });
-    });
-  };
-  const useContext = () => {
-    if (!storage2) {
-      throw new Error(`Unable to use async_hook, please confirm the node version >= 12.17
-        `);
-    }
-    const context = storage2 === null || storage2 === void 0 ? void 0 : storage2.getStore();
-    if (!context) {
-      throw new Error(`Can't call useContext out of scope, make sure @modern-js/runtime-utils is a single version in node_modules`);
-    }
-    return context;
-  };
-  return {
-    run,
-    useContext
-  };
-};
-const storage = createStorage();
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  storage
-});

package/dist/esm/node/storage.js

@@ -1,39 +0,0 @@
-import * as ah from "async_hooks";
-var createStorage = function() {
-  var storage2;
-  if (typeof ah.AsyncLocalStorage !== "undefined") {
-    storage2 = new ah.AsyncLocalStorage();
-  }
-  var run = function(context, cb) {
-    if (!storage2) {
-      throw new Error("Unable to use async_hook, please confirm the node version >= 12.17\n        ");
-    }
-    return new Promise(function(resolve, reject) {
-      storage2.run(context, function() {
-        try {
-          return resolve(cb());
-        } catch (error) {
-          return reject(error);
-        }
-      });
-    });
-  };
-  var useContext = function() {
-    if (!storage2) {
-      throw new Error("Unable to use async_hook, please confirm the node version >= 12.17\n        ");
-    }
-    var context = storage2 === null || storage2 === void 0 ? void 0 : storage2.getStore();
-    if (!context) {
-      throw new Error("Can't call useContext out of scope, make sure @modern-js/runtime-utils is a single version in node_modules");
-    }
-    return context;
-  };
-  return {
-    run,
-    useContext
-  };
-};
-var storage = createStorage();
-export {
-  storage
-};

package/dist/esm-node/node/storage.js

@@ -1,41 +0,0 @@
-import * as ah from "async_hooks";
-const createStorage = () => {
-  let storage2;
-  if (typeof ah.AsyncLocalStorage !== "undefined") {
-    storage2 = new ah.AsyncLocalStorage();
-  }
-  const run = (context, cb) => {
-    if (!storage2) {
-      throw new Error(`Unable to use async_hook, please confirm the node version >= 12.17
-        `);
-    }
-    return new Promise((resolve, reject) => {
-      storage2.run(context, () => {
-        try {
-          return resolve(cb());
-        } catch (error) {
-          return reject(error);
-        }
-      });
-    });
-  };
-  const useContext = () => {
-    if (!storage2) {
-      throw new Error(`Unable to use async_hook, please confirm the node version >= 12.17
-        `);
-    }
-    const context = storage2 === null || storage2 === void 0 ? void 0 : storage2.getStore();
-    if (!context) {
-      throw new Error(`Can't call useContext out of scope, make sure @modern-js/runtime-utils is a single version in node_modules`);
-    }
-    return context;
-  };
-  return {
-    run,
-    useContext
-  };
-};
-const storage = createStorage();
-export {
-  storage
-};

package/dist/types/node/storage.d.ts

@@ -1,16 +0,0 @@
-/// <reference types="node" />
-import type { IncomingHttpHeaders } from 'http';
-import type { Monitors } from '@modern-js/types';
-declare const storage: {
-    run: <O>(context: {
-        headers?: IncomingHttpHeaders | undefined;
-        monitors?: Monitors | undefined;
-        request?: Request | undefined;
-    }, cb: () => O | Promise<O>) => Promise<O>;
-    useContext: () => {
-        headers?: IncomingHttpHeaders | undefined;
-        monitors?: Monitors | undefined;
-        request?: Request | undefined;
-    };
-};
-export { storage };