@rspack/dev-server 2.0.0-beta.5 → 2.0.0-beta.7

package/dist/rslib-runtime.js

@@ -10,11 +10,6 @@ function __webpack_require__(moduleId) {
     return module.exports;
 }
 __webpack_require__.m = __webpack_modules__;
-(()=>{
-    __webpack_require__.add = function(modules) {
-        Object.assign(__webpack_require__.m, modules);
-    };
-})();
 (()=>{
     __webpack_require__.n = (module)=>{
         var getter = module && module.__esModule ? ()=>module['default'] : ()=>module;
@@ -59,6 +54,11 @@ __webpack_require__.m = __webpack_modules__;
         });
     };
 })();
+(()=>{
+    __webpack_require__.add = function(modules) {
+        Object.assign(__webpack_require__.m, modules);
+    };
+})();
 (()=>{
     __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
 })();

package/dist/server.d.ts

@@ -7,11 +7,12 @@
  * Copyright (c) JS Foundation and other contributors
  * https://github.com/webpack/webpack-dev-server/blob/main/LICENSE
  */
-import type { BasicApplication, BasicServer, ClientConfiguration, ClientConnection, Compiler, ConnectHistoryApiFallbackOptions, DevMiddlewareContext, DevMiddlewareOptions, DevServer, EXPECTED_ANY, FSWatcher, HTTPServer, Headers, Host, LiteralUnion, Middleware, MultiCompiler, MultiStats, Open, Port, ProxyConfigArray, Request, RequestHandler, Response, ServerConfiguration, ServerType, Socket, Static, Stats, StatsOptions, WatchFiles, WatchOptions, WebSocketServerConfiguration, WebSocketServerImplementation } from './types';
+import type { DevServerClient, DevServerHeaders, DevServerHost, DevServerProxyConfigArray, DevServerStatic } from '@rspack/core';
+import type { BasicApplication, BasicServer, ClientConnection, Compiler, ConnectHistoryApiFallbackOptions, DevMiddlewareContext, DevMiddlewareOptions, DevServer, EXPECTED_ANY, FSWatcher, HTTPServer, LiteralUnion, Middleware, MultiCompiler, MultiStats, Open, Port, Request, RequestHandler, Response, ServerConfiguration, ServerType, Socket, Stats, StatsOptions, WatchFiles, WatchOptions, WebSocketServerConfiguration, WebSocketServerImplementation } from './types';
 import type { ConnectApplication } from './types';
 export interface Configuration<A extends BasicApplication = ConnectApplication, S extends BasicServer = HTTPServer> {
     ipc?: boolean | string;
-    host?: Host;
+    host?: DevServerHost;
     port?: Port;
     hot?: boolean | 'only';
     liveReload?: boolean;
@@ -20,15 +21,15 @@ export interface Configuration<A extends BasicApplication = ConnectApplication,
     allowedHosts?: LiteralUnion<'auto' | 'all', string> | string[];
     historyApiFallback?: boolean | ConnectHistoryApiFallbackOptions;
     watchFiles?: string | string[] | WatchFiles | Array<string | WatchFiles>;
-    static?: boolean | string | Static | Array<string | Static>;
+    static?: DevServerStatic;
     server?: ServerType<A, S> | ServerConfiguration<A, S>;
     app?: () => Promise<A>;
     webSocketServer?: boolean | LiteralUnion<'ws', string> | WebSocketServerConfiguration;
-    proxy?: ProxyConfigArray;
+    proxy?: DevServerProxyConfigArray;
     open?: boolean | string | Open | Array<string | Open>;
     setupExitSignals?: boolean;
-    client?: boolean | ClientConfiguration;
-    headers?: Headers | ((req: Request, res: Response, context: DevMiddlewareContext<Request, Response> | undefined) => Headers);
+    client?: boolean | DevServerClient;
+    headers?: DevServerHeaders | ((req: Request, res: Response, context: DevMiddlewareContext<Request, Response> | undefined) => DevServerHeaders);
     onListening?: (devServer: Server<A, S>) => void;
     setupMiddlewares?: (middlewares: Middleware[], devServer: Server<A, S>) => Middleware[];
 }
@@ -47,7 +48,7 @@ declare class Server<A extends BasicApplication = ConnectApplication, S extends
     currentHash: string | undefined;
     isTlsServer: boolean;
     webSocketServer: WebSocketServerImplementation | null | undefined;
-    middleware: import('webpack-dev-middleware').API<Request, Response> | undefined;
+    middleware: import('@rspack/dev-middleware').API<Request, Response> | undefined;
     server: S | undefined;
     app: A | undefined;
     stats: Stats | MultiStats | undefined;
@@ -55,7 +56,7 @@ declare class Server<A extends BasicApplication = ConnectApplication, S extends
     static get DEFAULT_STATS(): StatsOptions;
     static isAbsoluteURL(URL: string): boolean;
     static findIp(gatewayOrFamily: string, isInternal: boolean): string | undefined;
-    static getHostname(hostname: Host): Promise<string>;
+    static getHostname(hostname: DevServerHost): Promise<string>;
     static getFreePort(port: string, host: string): Promise<string | number>;
     static findCacheDir(): string;
     getClientEntry(): string;
@@ -63,7 +64,7 @@ declare class Server<A extends BasicApplication = ConnectApplication, S extends
     isValidHost(headers: Record<string, string | undefined>, headerToCheck: string, validateHost?: boolean): boolean;
     sendMessage(clients: ClientConnection[], type: string, data?: EXPECTED_ANY, params?: EXPECTED_ANY): void;
     watchFiles(watchPath: string | string[], watchOptions?: WatchOptions): Promise<void>;
-    invalidate(callback?: import('webpack-dev-middleware').Callback): void;
+    invalidate(callback?: import('@rspack/dev-middleware').Callback): void;
     start(): Promise<void>;
     startCallback(callback?: (err?: Error) => void): void;
     stop(): Promise<void>;

package/dist/types.d.ts

@@ -1,11 +1,10 @@
 import type { Server as HTTPServer, IncomingMessage, ServerResponse } from 'node:http';
 import type { ServerOptions } from 'node:https';
+import type { DevServer, DevServerMiddlewareHandler, DevServerOpenOptions, DevServerStaticItem } from '@rspack/core';
 import type { FSWatcher, ChokidarOptions as WatchOptions } from 'chokidar';
-import type { Options as ConnectHistoryApiFallbackOptions } from 'connect-history-api-fallback';
-import type { Server as ConnectApplication, IncomingMessage as ConnectIncomingMessage } from 'connect-next';
-import type { Options as HttpProxyMiddlewareOptions, Filter as HttpProxyMiddlewareOptionsFilter, RequestHandler } from 'http-proxy-middleware';
-import type { ServeStaticOptions } from 'serve-static';
-export type { FSWatcher, WatchOptions, RequestHandler, BasicServer, HTTPServer, ServerOptions, IncomingMessage, ConnectApplication, ConnectHistoryApiFallbackOptions, };
+import type { Server as ConnectApplication, IncomingMessage as ConnectIncomingMessage, ErrorHandleFunction, HandleFunction, NextHandleFunction } from 'connect-next';
+import type { RequestHandler } from 'http-proxy-middleware';
+export type { FSWatcher, WatchOptions, RequestHandler, BasicServer, HTTPServer, ServerOptions, IncomingMessage, ConnectApplication, };
 export type { IPv6 } from 'ipaddr.js';
 export type { Socket } from 'node:net';
 export type { AddressInfo } from 'node:net';
@@ -15,16 +14,11 @@ export type EXPECTED_ANY = any;
 type BasicServer = import('node:net').Server | import('node:tls').Server;
 /** https://github.com/microsoft/TypeScript/issues/29729 */
 export type LiteralUnion<T extends U, U> = T | (U & Record<never, never>);
-export type NextFunction = (err?: EXPECTED_ANY) => void;
-export type SimpleHandleFunction = (req: IncomingMessage, res: ServerResponse) => void;
-export type NextHandleFunction = (req: IncomingMessage, res: ServerResponse, next: NextFunction) => void;
-export type ErrorHandleFunction = (err: EXPECTED_ANY, req: IncomingMessage, res: ServerResponse, next: NextFunction) => void;
-export type HandleFunction = SimpleHandleFunction | NextHandleFunction | ErrorHandleFunction;
+export type ConnectHistoryApiFallbackOptions = Exclude<NonNullable<DevServer['historyApiFallback']>, boolean>;
 export type Request<T extends BasicApplication = ConnectApplication> = T extends ConnectApplication ? ConnectIncomingMessage : IncomingMessage;
 export type Response = ServerResponse;
-export type DevMiddlewareOptions<T extends Request, U extends Response> = import('webpack-dev-middleware').Options<T, U>;
-export type DevMiddlewareContext<T extends Request, U extends Response> = import('webpack-dev-middleware').Context<T, U>;
-export type Host = LiteralUnion<'local-ip' | 'local-ipv4' | 'local-ipv6', string>;
+export type DevMiddlewareOptions<T extends Request, U extends Response> = import('@rspack/dev-middleware').Options<T, U>;
+export type DevMiddlewareContext<T extends Request, U extends Response> = import('@rspack/dev-middleware').Context<T, U>;
 export type Port = number | LiteralUnion<'auto', string>;
 export interface WatchFiles {
     paths: string | string[];
@@ -33,16 +27,10 @@ export interface WatchFiles {
         poll?: number | boolean;
     };
 }
-export interface Static {
-    directory?: string;
-    publicPath?: string | string[];
-    staticOptions?: ServeStaticOptions;
-    watch?: boolean | NonNullable<WatchFiles['options']>;
-}
 export interface NormalizedStatic {
     directory: string;
     publicPath: string[];
-    staticOptions: ServeStaticOptions;
+    staticOptions: DevServerStaticItem['staticOptions'];
     watch: false | WatchOptions;
 }
 export type ServerType<A extends BasicApplication, S extends BasicServer> = LiteralUnion<'http' | 'https' | 'http2', string> | ((serverOptions: ServerOptions, application: A) => S);
@@ -62,57 +50,19 @@ export interface WebSocketServerImplementation {
     implementation: WebSocketServer;
     clients: ClientConnection[];
 }
-export type ProxyConfigArrayItem = {
-    /**
-     * Alias for `pathFilter` in `http-proxy-middleware` options.
-     * When both `context` and `pathFilter` are provided, `pathFilter` takes precedence.
-     */
-    context?: HttpProxyMiddlewareOptionsFilter;
-} & HttpProxyMiddlewareOptions;
-export type ProxyConfigArray = Array<ProxyConfigArrayItem | ((req?: Request | undefined, res?: Response | undefined, next?: NextFunction | undefined) => ProxyConfigArrayItem)>;
-export interface OpenApp {
-    name?: string;
-    arguments?: string[];
-}
-export interface Open {
-    app?: string | string[] | OpenApp;
+export type Open = DevServerOpenOptions & {
     target?: string | string[];
-}
+};
 export interface NormalizedOpen {
     target: string;
-    options: OpenOptions;
+    options: DevServerOpenOptions;
 }
-export interface WebSocketURL {
-    hostname?: string;
-    password?: string;
-    pathname?: string;
-    port?: number | string;
-    protocol?: string;
-    username?: string;
-}
-export interface ClientConfiguration {
-    logging?: 'log' | 'info' | 'warn' | 'error' | 'none' | 'verbose';
-    overlay?: boolean | {
-        warnings?: OverlayMessageOptions;
-        errors?: OverlayMessageOptions;
-        runtimeErrors?: OverlayMessageOptions;
-    };
-    progress?: boolean;
-    reconnect?: boolean | number;
-    webSocketTransport?: LiteralUnion<'ws', string>;
-    webSocketURL?: string | WebSocketURL;
-}
-export type Headers = Array<{
-    key: string;
-    value: string;
-}> | Record<string, string | string[]>;
-export type MiddlewareHandler = (...args: EXPECTED_ANY[]) => EXPECTED_ANY;
 export interface MiddlewareObject {
     name?: string;
     path?: string;
-    middleware: MiddlewareHandler;
+    middleware: DevServerMiddlewareHandler | ErrorHandleFunction;
 }
-export type Middleware = MiddlewareObject | MiddlewareHandler;
+export type Middleware = MiddlewareObject | DevServerMiddlewareHandler | ErrorHandleFunction;
 export type OverlayMessageOptions = boolean | ((error: Error) => void);
 declare function useFn(fn: NextHandleFunction): BasicApplication;
 declare function useFn(fn: HandleFunction): BasicApplication;
@@ -121,10 +71,3 @@ declare function useFn(route: string, fn: HandleFunction): BasicApplication;
 export type BasicApplication = {
     use: typeof useFn;
 };
-export type OpenOptions = {
-    readonly wait?: boolean;
-    readonly background?: boolean;
-    readonly newInstance?: boolean;
-    readonly app?: OpenApp | readonly OpenApp[];
-    readonly allowNonzeroExitCode?: boolean;
-};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack/dev-server",
-  "version": "2.0.0-beta.5",
+  "version": "2.0.0-beta.7",
   "description": "Development server for rspack",
   "homepage": "https://rspack.rs",
   "bugs": "https://github.com/rstackjs/rspack-dev-server/issues",
@@ -45,8 +45,7 @@
     ]
   },
   "dependencies": {
-    "@types/connect-history-api-fallback": "^1.5.4",
-    "@types/serve-static": "^2.2.0",
+    "@rspack/dev-middleware": "2.0.0-beta.2",
     "@types/ws": "^8.18.1",
     "chokidar": "^5.0.0",
     "connect-history-api-fallback": "^2.0.0",
@@ -54,19 +53,18 @@
     "http-proxy-middleware": "^3.0.5",
     "ipaddr.js": "^2.3.0",
     "serve-static": "^2.2.1",
-    "webpack-dev-middleware": "^7.4.5",
     "ws": "^8.19.0"
   },
   "devDependencies": {
     "@biomejs/biome": "^1.9.4",
     "@hono/node-server": "^1.19.11",
-    "@rslib/core": "^0.19.6",
-    "@rspack/core": "2.0.0-beta.5",
+    "@rslib/core": "^0.20.0",
+    "@rspack/core": "2.0.0-beta.6",
     "@rspack/plugin-react-refresh": "1.6.1",
-    "@rstest/core": "^0.9.0",
+    "@rstest/core": "^0.9.2",
     "@types/mime-types": "3.0.1",
     "@types/node": "^24.12.0",
-    "@types/node-forge": "^1.3.14",
+    "@types/serve-static": "^2.2.0",
     "@types/trusted-types": "^2.0.7",
     "@types/ws": "8.18.1",
     "cross-env": "^10.1.0",
@@ -80,14 +78,13 @@
     "open": "^11.0.0",
     "p-retry": "^7.1.1",
     "prettier": "3.8.1",
-    "puppeteer": "^24.38.0",
+    "puppeteer": "^24.39.0",
     "react-refresh": "0.18.0",
     "require-from-string": "^2.0.2",
     "selfsigned": "^5.5.0",
     "simple-git-hooks": "^2.13.1",
     "style-loader": "^4.0.0",
-    "typescript": "^5.9.3",
-    "webpack-dev-middleware": "^7.4.5"
+    "typescript": "^5.9.3"
   },
   "peerDependencies": {
     "@rspack/core": "^2.0.0-0",
@@ -98,7 +95,7 @@
       "optional": true
     }
   },
-  "packageManager": "pnpm@10.31.0",
+  "packageManager": "pnpm@10.32.1",
   "engines": {
     "node": "^20.19.0 || >=22.12.0"
   },