@modern-js/server-core 3.7.0 → 3.8.1

package/dist/cjs/context.js

@@ -32,7 +32,7 @@ __webpack_require__.d(__webpack_exports__, {
     useHonoContext: ()=>useHonoContext
 });
 const storage_js_namespaceObject = require("./utils/storage.js");
-const { run, useHonoContext } = (0, storage_js_namespaceObject.createStorage)();
+const { run, useHonoContext } = (0, storage_js_namespaceObject.createStorage)('@modern-js/server-core/hono-context');
 exports.run = __webpack_exports__.run;
 exports.useHonoContext = __webpack_exports__.useHonoContext;
 for(var __rspack_i in __webpack_exports__)if (-1 === [

package/dist/cjs/plugins/render/render.js

@@ -43,7 +43,8 @@ var __webpack_exports__ = {};
 (()=>{
     __webpack_require__.r(__webpack_exports__);
     __webpack_require__.d(__webpack_exports__, {
-        createRender: ()=>createRender
+        createRender: ()=>createRender,
+        matchRoute: ()=>matchRoute
     });
     const universal_namespaceObject = require("@modern-js/utils/universal");
     const trie_router_namespaceObject = require("hono/router/trie-router");
@@ -76,14 +77,27 @@ var __webpack_exports__ = {};
     }
     function matchRoute(router, pathname, entryName) {
         const matched = router.match('*', pathname);
-        if (entryName && matched[0].length > 1) {
-            const matches = matched[0];
-            const result = matches.find(([route])=>route.entryName === entryName);
-            return result || [];
+        const matchedRoutes = matched[0];
+        if (entryName && matchedRoutes.length > 1) {
+            for (const [route, params] of matchedRoutes)if (route.entryName === entryName) return [
+                route,
+                params
+            ];
+            return [
+                void 0,
+                {}
+            ];
         }
         {
-            const result = matched[0][0];
-            return result || [];
+            const result = matchedRoutes[0];
+            if (!result) return [
+                void 0,
+                {}
+            ];
+            return [
+                result[0],
+                result[1]
+            ];
         }
     }
     function getHeadersWithoutCookie(headers) {
@@ -260,8 +274,10 @@ var __webpack_exports__ = {};
     }
 })();
 exports.createRender = __webpack_exports__.createRender;
+exports.matchRoute = __webpack_exports__.matchRoute;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
-    "createRender"
+    "createRender",
+    "matchRoute"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {
     value: true

package/dist/cjs/utils/storage.js

@@ -31,9 +31,19 @@ __webpack_require__.d(__webpack_exports__, {
     createStorage: ()=>createStorage
 });
 const external_async_hooks_namespaceObject = require("async_hooks");
-const createStorage = ()=>{
+const getGlobalStorage = (globalKey)=>{
+    const registry = globalThis;
+    const key = Symbol.for(globalKey);
+    let storage = registry[key];
+    if (!storage) {
+        storage = new external_async_hooks_namespaceObject.AsyncLocalStorage();
+        registry[key] = storage;
+    }
+    return storage;
+};
+const createStorage = (globalKey)=>{
     let storage;
-    if (void 0 !== external_async_hooks_namespaceObject.AsyncLocalStorage) storage = new external_async_hooks_namespaceObject.AsyncLocalStorage();
+    if (void 0 !== external_async_hooks_namespaceObject.AsyncLocalStorage) storage = globalKey ? getGlobalStorage(globalKey) : new external_async_hooks_namespaceObject.AsyncLocalStorage();
     const run = (context, cb)=>{
         if (!storage) throw new Error(`Unable to use async_hook, please confirm the node version >= 12.17
         `);

package/dist/esm/context.mjs

@@ -1,3 +1,3 @@
 import { createStorage } from "./utils/storage.mjs";
-const { run: run, useHonoContext: useHonoContext } = createStorage();
+const { run: run, useHonoContext: useHonoContext } = createStorage('@modern-js/server-core/hono-context');
 export { run, useHonoContext };

package/dist/esm/plugins/render/render.mjs

@@ -36,14 +36,27 @@ function getRouter(routes) {
 }
 function matchRoute(router, pathname, entryName) {
     const matched = router.match('*', pathname);
-    if (entryName && matched[0].length > 1) {
-        const matches = matched[0];
-        const result = matches.find(([route])=>route.entryName === entryName);
-        return result || [];
+    const matchedRoutes = matched[0];
+    if (entryName && matchedRoutes.length > 1) {
+        for (const [route, params] of matchedRoutes)if (route.entryName === entryName) return [
+            route,
+            params
+        ];
+        return [
+            void 0,
+            {}
+        ];
     }
     {
-        const result = matched[0][0];
-        return result || [];
+        const result = matchedRoutes[0];
+        if (!result) return [
+            void 0,
+            {}
+        ];
+        return [
+            result[0],
+            result[1]
+        ];
     }
 }
 function getHeadersWithoutCookie(headers) {
@@ -218,4 +231,4 @@ async function csrRender(request, options) {
     });
     return csrRscRender(request, options);
 }
-export { createRender };
+export { createRender, matchRoute };

package/dist/esm/utils/storage.mjs

@@ -1,7 +1,17 @@
 import * as __rspack_external_async_hooks from "async_hooks";
-const createStorage = ()=>{
+const getGlobalStorage = (globalKey)=>{
+    const registry = globalThis;
+    const key = Symbol.for(globalKey);
+    let storage = registry[key];
+    if (!storage) {
+        storage = new __rspack_external_async_hooks.AsyncLocalStorage();
+        registry[key] = storage;
+    }
+    return storage;
+};
+const createStorage = (globalKey)=>{
     let storage;
-    if (void 0 !== __rspack_external_async_hooks.AsyncLocalStorage) storage = new __rspack_external_async_hooks.AsyncLocalStorage();
+    if (void 0 !== __rspack_external_async_hooks.AsyncLocalStorage) storage = globalKey ? getGlobalStorage(globalKey) : new __rspack_external_async_hooks.AsyncLocalStorage();
     const run = (context, cb)=>{
         if (!storage) throw new Error(`Unable to use async_hook, please confirm the node version >= 12.17
         `);

package/dist/esm-node/context.mjs

@@ -1,4 +1,4 @@
 import "node:module";
 import { createStorage } from "./utils/storage.mjs";
-const { run: run, useHonoContext: useHonoContext } = createStorage();
+const { run: run, useHonoContext: useHonoContext } = createStorage('@modern-js/server-core/hono-context');
 export { run, useHonoContext };

package/dist/esm-node/plugins/render/render.mjs

@@ -37,14 +37,27 @@ function getRouter(routes) {
 }
 function matchRoute(router, pathname, entryName) {
     const matched = router.match('*', pathname);
-    if (entryName && matched[0].length > 1) {
-        const matches = matched[0];
-        const result = matches.find(([route])=>route.entryName === entryName);
-        return result || [];
+    const matchedRoutes = matched[0];
+    if (entryName && matchedRoutes.length > 1) {
+        for (const [route, params] of matchedRoutes)if (route.entryName === entryName) return [
+            route,
+            params
+        ];
+        return [
+            void 0,
+            {}
+        ];
     }
     {
-        const result = matched[0][0];
-        return result || [];
+        const result = matchedRoutes[0];
+        if (!result) return [
+            void 0,
+            {}
+        ];
+        return [
+            result[0],
+            result[1]
+        ];
     }
 }
 function getHeadersWithoutCookie(headers) {
@@ -219,4 +232,4 @@ async function csrRender(request, options) {
     });
     return csrRscRender(request, options);
 }
-export { createRender };
+export { createRender, matchRoute };

package/dist/esm-node/utils/storage.mjs

@@ -1,8 +1,18 @@
 import "node:module";
 import * as __rspack_external_async_hooks from "async_hooks";
-const createStorage = ()=>{
+const getGlobalStorage = (globalKey)=>{
+    const registry = globalThis;
+    const key = Symbol.for(globalKey);
+    let storage = registry[key];
+    if (!storage) {
+        storage = new __rspack_external_async_hooks.AsyncLocalStorage();
+        registry[key] = storage;
+    }
+    return storage;
+};
+const createStorage = (globalKey)=>{
     let storage;
-    if (void 0 !== __rspack_external_async_hooks.AsyncLocalStorage) storage = new __rspack_external_async_hooks.AsyncLocalStorage();
+    if (void 0 !== __rspack_external_async_hooks.AsyncLocalStorage) storage = globalKey ? getGlobalStorage(globalKey) : new __rspack_external_async_hooks.AsyncLocalStorage();
     const run = (context, cb)=>{
         if (!storage) throw new Error(`Unable to use async_hook, please confirm the node version >= 12.17
         `);

package/dist/types/plugins/render/render.d.ts

@@ -1,6 +1,8 @@
 import type { ServerRoute } from '@modern-js/types';
+import type { Router } from 'hono/router';
 import type { CacheConfig, OnFallback, UserConfig } from '../../types';
 import type { Render } from '../../types';
+import type { Params } from '../../types/requestHandler';
 interface CreateRenderOptions {
     pwd: string;
     routes: ServerRoute[];
@@ -13,5 +15,7 @@ interface CreateRenderOptions {
     forceCSRMap?: Map<string, boolean>;
     nonce?: string;
 }
+type MatchedRoute = [ServerRoute | undefined, Params];
+export declare function matchRoute(router: Router<ServerRoute>, pathname: string, entryName?: string): MatchedRoute;
 export declare function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig, forceCSR, forceCSRMap, config, onFallback, }: CreateRenderOptions): Promise<Render>;
 export {};

package/dist/types/types/config/dev.d.ts

@@ -1,4 +1,10 @@
 export interface DevUserConfig {
     assetPrefix?: string;
+    /**
+     * Customize the directory containing the Mock API entry file.
+     * Relative paths are resolved from the application directory.
+     * @default './config/mock'
+     */
+    mockDir?: string;
 }
 export type DevNormalizedConfig = DevUserConfig;

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

@@ -1,4 +1,4 @@
-declare const createStorage: <T>() => {
+declare const createStorage: <T>(globalKey?: string) => {
     run: <O>(context: T, cb: () => O | Promise<O>) => Promise<O>;
     useHonoContext: () => T;
 };

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.7.0",
+  "version": "3.8.1",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
   "exports": {
@@ -71,9 +71,9 @@
     "flatted": "^3.4.2",
     "hono": "^4.11.7",
     "ts-deepmerge": "7.0.3",
-    "@modern-js/plugin": "3.7.0",
-    "@modern-js/runtime-utils": "3.7.0",
-    "@modern-js/utils": "3.7.0"
+    "@modern-js/plugin": "3.8.1",
+    "@modern-js/runtime-utils": "3.8.1",
+    "@modern-js/utils": "3.8.1"
   },
   "devDependencies": {
     "@rslib/core": "0.23.2",
@@ -82,9 +82,9 @@
     "@types/node": "^20",
     "http-proxy-middleware": "^2.0.10",
     "typescript": "^5",
-    "@scripts/rstest-config": "2.66.0",
     "@modern-js/rslib": "2.68.10",
-    "@modern-js/types": "3.7.0"
+    "@modern-js/types": "3.8.1",
+    "@scripts/rstest-config": "2.66.0"
   },
   "sideEffects": false,
   "publishConfig": {