@modern-js/server 2.42.2 → 2.44.0

package/dist/types/dev-tools/dev-middleware/socketServer.d.ts

@@ -1,4 +1,6 @@
 /// <reference types="node" />
+/// <reference types="node/http" />
+/// <reference types="@modern-js/prod-server/src/type" />
 import { Server } from 'http';
 import ws from 'ws';
 import type webpack from 'webpack';

package/dist/types/dev-tools/https/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import type Buffer from 'buffer';
 import type { DevServerHttpsOptions } from '../../types';
 export declare const genHttpsOptions: (userOptions: DevServerHttpsOptions, pwd: string) => Promise<{

package/dist/types/dev-tools/mock/getMockData.d.ts

@@ -1,4 +1,6 @@
 /// <reference types="node" />
+/// <reference types="node/http" />
+/// <reference types="@modern-js/prod-server/src/type" />
 import { IncomingMessage, ServerResponse } from 'http';
 import type { ModernServerContext, NextFunction } from '@modern-js/types';
 export type MockConfig = Record<string, {

package/dist/types/index.d.ts

@@ -1,6 +1,6 @@
-import { DevServer as Server } from './server';
-import type { ModernDevServerOptions } from './types';
-export { Server };
-export type { ModernDevServerOptions };
+import { DevServer as Server, DevServerForRsbuild as ServerForRsbuild } from './server';
+import type { ModernDevServerOptions, ModernDevServerOptionsNew } from './types';
+export { Server, ServerForRsbuild };
+export type { ModernDevServerOptions, ModernDevServerOptionsNew };
 declare const _default: (options: ModernDevServerOptions) => Promise<Server>;
 export default _default;

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

@@ -1,37 +1,39 @@
 /// <reference types="node" />
 /// <reference types="node" />
+/// <reference types="node/http" />
+/// <reference types="@modern-js/prod-server/src/type" />
 import { IncomingMessage, Server, ServerResponse } from 'http';
 import { NextFunction, ServerHookRunner, ModernServer, BuildOptions } from '@modern-js/prod-server';
 import type { ModernServerContext } from '@modern-js/types';
 import { RenderHandler } from '@modern-js/prod-server/src/libs/render';
 import { WatchEvent } from '../dev-tools/watcher';
-import type { ModernDevServerOptions } from '../types';
+import type { ModernDevServerOptionsNew } from '../types';
 export declare class ModernDevServer extends ModernServer {
     private mockHandler;
     private readonly dev;
     private readonly useWorkerSSR;
     private readonly appContext;
-    private readonly devMiddleware;
+    private getMiddlewares;
+    private rsbuild;
     private watcher?;
-    constructor(options: ModernDevServerOptions);
+    private closeCb;
+    constructor(options: ModernDevServerOptionsNew);
     private getDevOptions;
     private addMiddlewareHandler;
-    private applySetupMiddlewares;
     onInit(runner: ServerHookRunner, app: Server): Promise<void>;
+    private initFileReader;
+    close(): Promise<void>;
     getRenderHandler(): RenderHandler;
     private applyDefaultMiddlewares;
     onRepack(options?: BuildOptions): void;
     createHTTPServer(handler: (req: IncomingMessage, res: ServerResponse, next?: () => void) => void): Promise<Server<typeof IncomingMessage, typeof ServerResponse> | import("https").Server<typeof IncomingMessage, typeof ServerResponse>>;
     protected warmupSSRBundle(): void;
-    protected initReader(): void;
     protected onServerChange({ filepath, event, }: {
         filepath: string;
         event: WatchEvent;
     }): Promise<void>;
     protected createContext(req: IncomingMessage, res: ServerResponse): import("@modern-js/prod-server/src/libs/context").ModernServerContext;
-    protected setupStaticMiddleware(_: string): (context: ModernServerContext, next: NextFunction) => Promise<void>;
-    private setupBeforeDevMiddleware;
-    private setupAfterDevMiddleware;
+    protected setupStaticMiddleware(_: string): (_context: ModernServerContext, next: NextFunction) => Promise<void>;
     private cleanSSRCache;
     private startWatcher;
 }

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

@@ -0,0 +1,37 @@
+/// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node/http" />
+/// <reference types="@modern-js/prod-server/src/type" />
+import { IncomingMessage, Server, ServerResponse } from 'http';
+import { NextFunction, ServerHookRunner, ModernServer, BuildOptions } from '@modern-js/prod-server';
+import type { ModernServerContext } from '@modern-js/types';
+import { RenderHandler } from '@modern-js/prod-server/src/libs/render';
+import { WatchEvent } from '../dev-tools/watcher';
+import type { ModernDevServerOptions } from '../types';
+export declare class ModernDevServer extends ModernServer {
+    private mockHandler;
+    private readonly dev;
+    private readonly useWorkerSSR;
+    private readonly appContext;
+    private readonly devMiddleware;
+    private watcher?;
+    constructor(options: ModernDevServerOptions);
+    private getDevOptions;
+    private addMiddlewareHandler;
+    private applySetupMiddlewares;
+    onInit(runner: ServerHookRunner, app: Server): Promise<void>;
+    getRenderHandler(): RenderHandler;
+    private initFileReader;
+    private applyDefaultMiddlewares;
+    onRepack(options?: BuildOptions): void;
+    createHTTPServer(handler: (req: IncomingMessage, res: ServerResponse, next?: () => void) => void): Promise<Server<typeof IncomingMessage, typeof ServerResponse> | import("https").Server<typeof IncomingMessage, typeof ServerResponse>>;
+    protected warmupSSRBundle(): void;
+    protected onServerChange({ filepath, event, }: {
+        filepath: string;
+        event: WatchEvent;
+    }): Promise<void>;
+    protected createContext(req: IncomingMessage, res: ServerResponse): import("@modern-js/prod-server/src/libs/context").ModernServerContext;
+    protected setupStaticMiddleware(_: string): (context: ModernServerContext, next: NextFunction) => Promise<void>;
+    private cleanSSRCache;
+    private startWatcher;
+}

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

@@ -1,5 +1,8 @@
 import { Server } from '@modern-js/prod-server';
-import type { ModernDevServerOptions } from '../types';
+import type { ModernDevServerOptions, ModernDevServerOptionsNew } from '../types';
 export declare class DevServer extends Server {
     constructor(options: ModernDevServerOptions);
 }
+export declare class DevServerForRsbuild extends Server {
+    constructor(options: ModernDevServerOptionsNew);
+}

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

@@ -1,7 +1,8 @@
 import { ServerHookRunner } from '@modern-js/prod-server';
 import { ModernServerContext } from '@modern-js/types/server';
+import { ModernRoute } from '@modern-js/prod-server/src/libs/route';
 export declare function workerSSRRender(ctx: ModernServerContext, renderOptions: {
-    urlPath: string;
+    route: ModernRoute;
     [props: string]: any;
 }, _runner: ServerHookRunner): Promise<{
     content: any;

package/dist/types/types.d.ts

@@ -1,7 +1,10 @@
 /// <reference types="node" />
+/// <reference types="node/http" />
+/// <reference types="@modern-js/prod-server/src/type" />
 import type { IncomingMessage, ServerResponse } from 'http';
 import type { DevServerOptions, DevServerHttpsOptions, NextFunction } from '@modern-js/types';
 import type { ModernServerOptions } from '@modern-js/prod-server';
+import type { RsbuildInstance, DevServerAPIs, DevMiddlewaresConfig } from '@rsbuild/shared';
 export type { DevServerOptions, DevServerHttpsOptions };
 type Middleware = (req: IncomingMessage, res: ServerResponse, next: NextFunction) => Promise<void>;
 export type DevMiddlewareAPI = Middleware & {
@@ -36,3 +39,10 @@ export type ExtraOptions = {
     useWorkerSSR?: boolean;
 };
 export type ModernDevServerOptions = ModernServerOptions & ExtraOptions;
+export type ExtraOptionsNew = {
+    dev: Partial<DevServerOptions>;
+    useWorkerSSR?: boolean;
+    rsbuild: RsbuildInstance;
+    getMiddlewares: (overrides?: DevMiddlewaresConfig) => ReturnType<DevServerAPIs['getMiddlewares']>;
+};
+export type ModernDevServerOptionsNew = ModernServerOptions & ExtraOptionsNew;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.42.2",
+  "version": "2.44.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -27,6 +27,7 @@
         "import": "./dist/esm-node/index.js",
         "require": "./dist/cjs/index.js"
       },
+      "types": "./dist/types/index.d.ts",
       "default": "./dist/esm/index.js"
     },
     "./hmr-client": {
@@ -47,13 +48,14 @@
     "path-to-regexp": "^6.2.0",
     "ws": "^8.13.0",
     "axios": "^1.6.0",
-    "@modern-js/prod-server": "2.42.2",
-    "@modern-js/types": "2.42.2",
-    "@modern-js/server-utils": "2.42.2",
-    "@modern-js/utils": "2.42.2",
-    "@modern-js/runtime-utils": "2.42.2"
+    "@modern-js/prod-server": "2.44.0",
+    "@modern-js/server-utils": "2.44.0",
+    "@modern-js/types": "2.44.0",
+    "@modern-js/utils": "2.44.0",
+    "@modern-js/runtime-utils": "2.44.0"
   },
   "devDependencies": {
+    "@rsbuild/shared": "0.2.11",
     "@types/connect-history-api-fallback": "^1.3.5",
     "@types/jest": "^29",
     "@types/minimatch": "^3.0.5",
@@ -64,11 +66,11 @@
     "ts-node": "^10.9.1",
     "tsconfig-paths": "4.1.1",
     "typescript": "^5",
-    "webpack": "^5.88.1",
+    "webpack": "^5.89.0",
     "websocket": "^1",
-    "@modern-js/server-core": "2.42.2",
-    "@scripts/build": "2.42.2",
-    "@scripts/jest-config": "2.42.2"
+    "@modern-js/server-core": "2.44.0",
+    "@scripts/build": "2.44.0",
+    "@scripts/jest-config": "2.44.0"
   },
   "peerDependencies": {
     "devcert": "^1.0.0",