@modern-js/prod-server 2.21.1 → 2.22.1

package/dist/types/libs/render/reader.d.ts

@@ -1,8 +1,10 @@
 /// <reference types="node" />
+import type { IFs } from 'memfs';
 export declare class LruReader {
   private readonly cache;
+  private fs;
   constructor();
-  init(): void;
+  init(fs?: IFs): void;
   close(): void;
   read(filepath: string): Promise<{
     content: Buffer;
@@ -14,5 +16,5 @@ export declare class LruReader {
 }
 export declare const readFile: (filepath: string) => Promise<Buffer | undefined>;
 export declare const updateFile: () => void;
-export declare const init: () => void;
+export declare const init: (fs?: IFs) => void;
 export declare const close: () => void;

package/dist/types/renderHtml.d.ts

@@ -0,0 +1,21 @@
+/// <reference types="node" />
+import { IncomingHttpHeaders, OutgoingHttpHeaders } from 'http';
+import { ModernServerOptions } from './type';
+export interface RenderHtmlOptions {
+  /** request url */
+  url: string;
+  /** request method */
+  method?: string;
+  /** request headers  */
+  headers?: IncomingHttpHeaders;
+  /** request body */
+  body?: string;
+  serverOptions: ModernServerOptions;
+}
+export interface ReturnResponse {
+  headers: OutgoingHttpHeaders;
+  redirected: boolean;
+  status: number;
+  url: string;
+  body: string;
+}

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

@@ -26,7 +26,11 @@ export declare class Server {
    * - 执行 prepare hook
    * - 执行 server init
    */
-  init(): Promise<this>;
+  init({
+    disableHttpServer
+  }?: {
+    disableHttpServer: boolean;
+  }): Promise<this>;
   /**
    * Execute config hooks
    * @param runner

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

@@ -42,14 +42,15 @@ export declare class ModernServer implements ModernServerInterface {
   }: ModernServerOptions);
   onInit(runner: ServerHookRunner, app: Server): Promise<void>;
   onRepack(_: BuildOptions): void;
+  getRequestHandler(): (req: IncomingMessage, res: ServerResponse, next?: () => void) => void | ServerResponse;
+  render(req: IncomingMessage, res: ServerResponse, url?: string): Promise<string | import("stream").Readable | null>;
+  createHTTPServer(handler: (req: IncomingMessage, res: ServerResponse, next?: () => void) => void): Promise<Server<typeof IncomingMessage, typeof ServerResponse>>;
+  protected initReader(): void;
   protected onServerChange({
     filepath
   }: {
     filepath: string;
   }): Promise<void>;
-  getRequestHandler(): (req: IncomingMessage, res: ServerResponse, next?: () => void) => void | ServerResponse;
-  render(req: IncomingMessage, res: ServerResponse, url?: string): Promise<string | import("stream").Readable | null>;
-  createHTTPServer(handler: (req: IncomingMessage, res: ServerResponse, next?: () => void) => void): Promise<Server<typeof IncomingMessage, typeof ServerResponse>>;
   protected getRoutes(): ServerRoute[];
   protected addHandler(handler: ModernServerHandler): void;
   protected render404(context: ModernServerContext): void;

package/dist/types/utils.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node/http" />
-/// <reference types=".dts-temp/tNQNz5diNrmZleL5wsuCm/src/type" />
+/// <reference types=".dts-temp/3ZBk4sVfhWju-jJlzqgTy/src/type" />
 import { IncomingMessage } from 'http';
 import type { OutputNormalizedConfig, HtmlNormalizedConfig } from '@modern-js/server-core';
 export declare const debug: any;

package/dist/types/workerServer.d.ts

@@ -1,3 +1,4 @@
+import { AfterMatchContext, AfterRenderContext, MiddlewareContext, NextFunction } from '@modern-js/types';
 import { ModernRouteInterface } from './libs/route';
 export type Context = Record<string, any>;
 export interface HandlerOptions {
@@ -31,14 +32,24 @@ export declare class ReturnResponse {
    */
   setHeaders(headers: Record<string, any>): this;
 }
+type Middleware = (context: MiddlewareContext<'worker'>, next: NextFunction) => Promise<void> | void;
+type ServerHooks = {
+  middleware?: Middleware | Middleware[];
+  afterRender?: (ctx: AfterRenderContext, next: unknown) => Promise<void> | void;
+  afterMatch?: (ctx: AfterMatchContext, next: unknown) => Promise<void> | void;
+};
+type Page = {
+  entryName: string;
+  template: string;
+  serverHooks?: ServerHooks;
+  serverRender?: (ctx: Record<string, any>) => Promise<string>;
+};
 export type Manifest = {
-  pages: Record<string,
-  // path
-  {
-    entryName: string;
-    template: string;
-    serverRender?: (ctx: Record<string, any>) => Promise<string>;
-  }>;
+  /**
+   * @param key - path
+   */
+  pages: Record<string, Page>;
   routes: ModernRouteInterface[];
 };
-export declare const createHandler: (manifest: Manifest) => (options: HandlerOptions) => Promise<ReturnResponse>;
+export declare const createHandler: (manifest: Manifest) => (options: HandlerOptions) => Promise<ReturnResponse>;
+export {};

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.21.1",
+  "version": "2.22.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -38,6 +38,15 @@
       },
       "types": "./dist/types/workerServer.d.ts",
       "default": "./dist/esm/workerServer.js"
+    },
+    "./renderHtml": {
+      "node": {
+        "jsnext:source": "./src/renderHtml.ts",
+        "import": "./dist/esm-node/renderHtml.js",
+        "require": "./dist/cjs/renderHtml.js"
+      },
+      "types": "./dist/types/renderHtml.d.ts",
+      "default": "./dist/esm/renderHtml.js"
     }
   },
   "typesVersions": {
@@ -47,6 +56,9 @@
       ],
       "worker": [
         "./dist/types/workerServer.d.ts"
+      ],
+      "renderHtml": [
+        "./dist/types/renderHtml.d.ts"
       ]
     }
   },
@@ -61,8 +73,9 @@
     "path-to-regexp": "^6.2.0",
     "serve-static": "^1.14.1",
     "@swc/helpers": "0.5.1",
-    "@modern-js/utils": "2.21.1",
-    "@modern-js/server-core": "2.21.1"
+    "@modern-js/utils": "2.22.1",
+    "@modern-js/server-core": "2.22.1",
+    "@modern-js/plugin": "2.22.1"
   },
   "devDependencies": {
     "@types/cookie": "^0.4.1",
@@ -78,10 +91,11 @@
     "node-mocks-http": "^1.11.0",
     "portfinder": "^1.0.28",
     "typescript": "^5",
-    "@modern-js/types": "2.21.1",
-    "@modern-js/server-core": "2.21.1",
-    "@scripts/jest-config": "2.21.1",
-    "@scripts/build": "2.21.1"
+    "memfs": "^3.5.1",
+    "@modern-js/types": "2.22.1",
+    "@modern-js/server-core": "2.22.1",
+    "@scripts/jest-config": "2.22.1",
+    "@scripts/build": "2.22.1"
   },
   "sideEffects": false,
   "publishConfig": {