@modern-js/server-core 2.67.2 → 2.67.4

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

@@ -1,6 +1,6 @@
 import type { Server as NodeServer } from 'http';
 import type { Http2SecureServer } from 'node:http2';
-import type { CacheOption, Container, HttpMethodDecider, Logger, Metrics, MiddlewareContext, Reporter, ServerRoute, UnstableMiddleware } from '@modern-js/types';
+import type { CacheOption, Container, HttpMethodDecider, Logger, Metrics, MiddlewareContext, Reporter, ServerRoute } from '@modern-js/types';
 import type { MiddlewareHandler } from 'hono';
 import type { UserConfig } from '../config';
 import type { Render } from '../render';
@@ -36,14 +36,15 @@ export type WebServerStartInput = {
 export type WebAdapter = (ctx: MiddlewareContext) => void | Promise<void>;
 /** Plugin Api */
 type MiddlewareOrder = 'pre' | 'post' | 'default';
-export type Middleware = {
+export type MiddlewareObj = {
     name: string;
     path?: string;
     method?: 'options' | 'get' | 'post' | 'put' | 'delete' | 'patch' | 'all';
     handler: MiddlewareHandler | MiddlewareHandler[];
-    before?: Array<Middleware['name']>;
+    before?: Array<MiddlewareObj['name']>;
     order?: MiddlewareOrder;
 };
+export type ServerMiddleware = MiddlewareObj;
 export interface GetRenderHandlerOptions {
     pwd: string;
     routes: ServerRoute[];
@@ -55,7 +56,8 @@ export interface GetRenderHandlerOptions {
 }
 declare module '@modern-js/types' {
     interface ISAppContext {
-        middlewares: Middleware[];
+        renderMiddlewares: MiddlewareObj[];
+        middlewares: MiddlewareObj[];
         metaName: string;
         getRenderOptions?: GetRenderHandlerOptions;
         render?: Render;
@@ -67,12 +69,8 @@ export type CacheConfig = {
     strategy: CacheOption;
     container?: Container;
 };
-type RenderMiddleware = UnstableMiddleware;
-export interface RenderConfig {
-    cache?: CacheConfig;
-    middleware?: RenderMiddleware[];
-}
 export type ServerConfig = {
-    render?: RenderConfig;
+    renderMiddlewares?: MiddlewareObj[];
+    middlewares?: MiddlewareObj[];
     plugins?: (ServerPlugin | ServerPluginLegacy)[];
 } & UserConfig;

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

@@ -1,3 +1,3 @@
 export * from './new';
 export * from './old';
-export type { ServerConfig, CacheConfig, OnFallback, FallbackReason, GetRenderHandlerOptions, FileChangeEvent, FallbackInput, WebServerStartInput, APIServerStartInput, } from './base';
+export type { ServerConfig, CacheConfig, OnFallback, FallbackReason, GetRenderHandlerOptions, FileChangeEvent, FallbackInput, WebServerStartInput, APIServerStartInput, ServerMiddleware, MiddlewareObj, } from './base';

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

@@ -2,7 +2,7 @@ import type { AsyncHook, AsyncPipelineHook, ServerContext as BaseServerContext,
 import type { Hooks } from '@modern-js/plugin-v2/server';
 import type { AfterMatchContext, AfterRenderContext, AfterStreamingRenderContext, ISAppContext, UnstableMiddleware } from '@modern-js/types';
 import type { MiddlewareHandler } from 'hono';
-import type { Middleware } from './base';
+import type { MiddlewareObj } from './base';
 import type { APIServerStartInput, FallbackInput, ServerConfig, WebAdapter, WebServerStartInput } from './base';
 export type FallbackFn = (input: FallbackInput) => Promise<FallbackInput>;
 export type PrepareWebServerFn = (input: WebServerStartInput) => Promise<WebAdapter | Array<UnstableMiddleware> | null>;
@@ -13,7 +13,7 @@ export type AfterStreamingRenderContextFn = (ctx: AfterStreamingRenderContext) =
 export interface ServerPluginExtends extends BaseServerPluginExtends {
     config: ServerConfig;
     extendContext: {
-        middlewares: Middleware[];
+        middlewares: MiddlewareObj[];
     };
     extendApi: {
         setAppContext: (c: ISAppContext) => void;

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

@@ -63,4 +63,4 @@ type ServerVariables = {
 export type ServerEnv = {
     Variables: ServerVariables;
 };
-export type { Context, Env, HonoRequest, Next, MiddlewareHandler as Middleware, } from 'hono';
+export type { Context, Env, HonoRequest, Next, MiddlewareHandler, MiddlewareHandler as Middleware, } from 'hono';

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

@@ -0,0 +1,5 @@
+declare const createStorage: <T>() => {
+    run: <O>(context: T, cb: () => O | Promise<O>) => Promise<O>;
+    useHonoContext: () => T;
+};
+export { createStorage };

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.67.2",
+  "version": "2.67.4",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -50,23 +50,25 @@
     "@web-std/fetch": "^4.2.1",
     "@web-std/file": "^3.0.3",
     "@web-std/stream": "^1.0.3",
+    "cloneable-readable": "^3.0.0",
     "flatted": "^3.2.9",
     "hono": "^3.12.2",
     "ts-deepmerge": "7.0.2",
-    "@modern-js/plugin": "2.67.2",
-    "@modern-js/runtime-utils": "2.67.2",
-    "@modern-js/plugin-v2": "2.67.2",
-    "@modern-js/utils": "2.67.2"
+    "@modern-js/plugin": "2.67.4",
+    "@modern-js/plugin-v2": "2.67.4",
+    "@modern-js/runtime-utils": "2.67.4",
+    "@modern-js/utils": "2.67.4"
   },
   "devDependencies": {
+    "@types/cloneable-readable": "^2.0.3",
     "@types/jest": "^29",
     "@types/merge-deep": "^3.0.0",
     "@types/node": "^14",
-    "http-proxy-middleware": "^2.0.4",
+    "http-proxy-middleware": "^2.0.9",
     "jest": "^29",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
-    "@modern-js/types": "2.67.2",
+    "@modern-js/types": "2.67.4",
     "@scripts/build": "2.66.0",
     "@scripts/jest-config": "2.66.0"
   },