@rspack/dev-server 2.0.0-beta.2 → 2.0.0-beta.4

package/README.md

@@ -11,7 +11,7 @@ Use Rspack with a development server that provides live reloading. This should b
 
 ## Versions
 
-- `2.x`: For Rspack v2
+- `2.x`: For Rspack v2, see [v1 -> v2](./docs/migrate-v1-to-v2.md) for migration guide.
 - `1.x`: For Rspack v1, see [v1.x - README](https://github.com/rstackjs/rspack-dev-server/tree/v1.x#rspackdev-server) for usage guide.
 
 ## Installation

package/client/type.d.ts

@@ -0,0 +1,15 @@
+export type LogLevel = false | true | 'none' | 'error' | 'warn' | 'info' | 'log' | 'verbose';
+export type EXPECTED_ANY = any;
+declare global {
+    const __resourceQuery: string;
+    const BUILD_HASH: string;
+    const RESOURCE_QUERY: string;
+}
+export interface CommunicationClient {
+    onOpen(fn: (...args: unknown[]) => void): void;
+    onClose(fn: (...args: unknown[]) => void): void;
+    onMessage(fn: (...args: unknown[]) => void): void;
+}
+export interface CommunicationClientConstructor {
+    new (url: string): CommunicationClient;
+}

package/dist/131.js

@@ -1,3 +1,4 @@
+import * as __rspack_external_zlib from "zlib";
 import { __webpack_require__ } from "./rslib-runtime.js";
 import node_fs, { lstatSync, promises, readFileSync, realpathSync, statSync, unlinkSync } from "node:fs";
 import { createRequire } from "node:module";
@@ -8,6 +9,94 @@ import { deprecate, promisify, styleText } from "node:util";
 import ipaddr from "ipaddr.js";
 import { createServer } from "node:net";
 import { WebSocketServer } from "ws";
+__webpack_require__.add({
+    "./node_modules/.pnpm/http-compression@1.1.2/node_modules/http-compression/src/index.js" (module, __unused_rspack_exports, __webpack_require__) {
+        const zlib = __webpack_require__("zlib");
+        const MIMES = /text|javascript|\/json|xml/i;
+        const noop = ()=>{};
+        const getChunkSize = (chunk, enc)=>chunk ? Buffer.byteLength(chunk, enc) : 0;
+        module.exports = ({ threshold = 1024, level = {
+            brotli: 0,
+            gzip: 1
+        }, brotli = true, gzip = true, mimes = MIMES } = {})=>{
+            const brotliOpts = 'object' == typeof brotli && brotli || {};
+            const gzipOpts = 'object' == typeof gzip && gzip || {};
+            if (brotli && !zlib.createBrotliCompress) brotli = false;
+            return (req, res, next = noop)=>{
+                const accept = req.headers['accept-encoding'];
+                const encoding = accept && (brotli && accept.match(/\bbr\b/) || gzip && accept.match(/\bgzip\b/) || [])[0];
+                if ('HEAD' === req.method || !encoding) return next();
+                let compress;
+                let pendingStatus;
+                let pendingListeners = [];
+                let started = false;
+                let size = 0;
+                function start() {
+                    started = true;
+                    size = 0 | res.getHeader('Content-Length') || size;
+                    const compressible = mimes.test(String(res.getHeader('Content-Type') || 'text/plain'));
+                    const cleartext = !res.getHeader('Content-Encoding');
+                    const listeners = pendingListeners || [];
+                    if (compressible && cleartext && size >= threshold) {
+                        res.setHeader('Content-Encoding', encoding);
+                        res.removeHeader('Content-Length');
+                        compress = 'br' === encoding ? zlib.createBrotliCompress({
+                            params: Object.assign({
+                                [zlib.constants.BROTLI_PARAM_QUALITY]: level.brotli,
+                                [zlib.constants.BROTLI_PARAM_SIZE_HINT]: size
+                            }, brotliOpts)
+                        }) : zlib.createGzip(Object.assign({
+                            level: level.gzip
+                        }, gzipOpts));
+                        compress.on('data', (chunk)=>false === write.call(res, chunk) && compress.pause());
+                        on.call(res, 'drain', ()=>compress.resume());
+                        compress.on('end', ()=>end.call(res));
+                        listeners.forEach((p)=>compress.on.apply(compress, p));
+                    } else {
+                        pendingListeners = null;
+                        listeners.forEach((p)=>on.apply(res, p));
+                    }
+                    writeHead.call(res, pendingStatus || res.statusCode);
+                }
+                const { end, write, on, writeHead } = res;
+                res.writeHead = function(status, reason, headers) {
+                    if ('string' != typeof reason) [headers, reason] = [
+                        reason,
+                        headers
+                    ];
+                    if (headers) for(const i in headers)res.setHeader(i, headers[i]);
+                    pendingStatus = status;
+                    return this;
+                };
+                res.write = function(chunk, enc) {
+                    size += getChunkSize(chunk, enc);
+                    if (!started) start();
+                    if (!compress) return write.apply(this, arguments);
+                    return compress.write.apply(compress, arguments);
+                };
+                res.end = function(chunk, enc) {
+                    if (arguments.length > 0 && 'function' != typeof chunk) size += getChunkSize(chunk, enc);
+                    if (!started) start();
+                    if (!compress) return end.apply(this, arguments);
+                    return compress.end.apply(compress, arguments);
+                };
+                res.on = function(type, listener) {
+                    if (pendingListeners && 'drain' === type) if (compress) compress.on(type, listener);
+                    else pendingListeners.push([
+                        type,
+                        listener
+                    ]);
+                    else on.call(this, type, listener);
+                    return this;
+                };
+                next();
+            };
+        };
+    },
+    zlib (module) {
+        module.exports = __rspack_external_zlib;
+    }
+});
 var external_node_util_namespaceObject = {};
 __webpack_require__.r(external_node_util_namespaceObject);
 __webpack_require__.d(external_node_util_namespaceObject, {
@@ -127,6 +216,8 @@ class WebsocketServer extends servers_BaseServer {
         });
     }
 }
+const src = __webpack_require__("./node_modules/.pnpm/http-compression@1.1.2/node_modules/http-compression/src/index.js");
+var src_default = /*#__PURE__*/ __webpack_require__.n(src);
 const { styleText: server_styleText } = external_node_util_namespaceObject;
 const server_require = createRequire(import.meta.url);
 if (!process.env.WEBPACK_SERVE) process.env.WEBPACK_SERVE = 'true';
@@ -142,7 +233,11 @@ const memoize = (fn)=>{
         return result;
     };
 };
-const getExpress = memoize(()=>server_require('express'));
+const getConnect = async ()=>{
+    const { connect } = await import("connect-next");
+    return connect;
+};
+const getServeStatic = memoize(()=>server_require('serve-static'));
 const encodeOverlaySettings = (setting)=>'function' == typeof setting ? encodeURIComponent(setting.toString()) : setting;
 const DEFAULT_ALLOWED_PROTOCOLS = /^(file|.+-extension):/i;
 function parseHostnameFromHeader(header) {
@@ -840,7 +935,7 @@ class Server {
         for (const webSocketProxy of webSocketProxies)this.server.on('upgrade', webSocketProxy.upgrade);
     }
     async setupApp() {
-        this.app = 'function' == typeof this.options.app ? await this.options.app() : getExpress()();
+        this.app = 'function' == typeof this.options.app ? await this.options.app() : (await getConnect())();
     }
     getStats(statsObj) {
         const stats = Server.DEFAULT_STATS;
@@ -906,13 +1001,10 @@ class Server {
                 next();
             }
         });
-        if (this.options.compress) {
-            const { default: compression } = await import("compression");
-            middlewares.push({
-                name: 'compression',
-                middleware: compression()
-            });
-        }
+        if (this.options.compress) middlewares.push({
+            name: 'compression',
+            middleware: src_default()()
+        });
         if (void 0 !== this.options.headers) middlewares.push({
             name: 'set-headers',
             middleware: this.setHeaders.bind(this)
@@ -1030,9 +1122,9 @@ class Server {
         }
         const staticOptions = this.options.static;
         if (staticOptions.length > 0) for (const staticOption of staticOptions)for (const publicPath of staticOption.publicPath)middlewares.push({
-            name: 'express-static',
+            name: 'serve-static',
             path: publicPath,
-            middleware: getExpress().static(staticOption.directory, staticOption.staticOptions)
+            middleware: getServeStatic()(staticOption.directory, staticOption.staticOptions)
         });
         if (this.options.historyApiFallback) {
             const connectHistoryApiFallback = server_require('connect-history-api-fallback');
@@ -1047,9 +1139,9 @@ class Server {
                 middleware: this.middleware
             });
             if (staticOptions.length > 0) for (const staticOption of staticOptions)for (const publicPath of staticOption.publicPath)middlewares.push({
-                name: 'express-static',
+                name: 'serve-static',
                 path: publicPath,
-                middleware: getExpress().static(staticOption.directory, staticOption.staticOptions)
+                middleware: getServeStatic()(staticOption.directory, staticOption.staticOptions)
             });
         }
         if (staticOptions.length > 0) {

package/dist/rslib-runtime.js

@@ -15,6 +15,15 @@ __webpack_require__.m = __webpack_modules__;
         Object.assign(__webpack_require__.m, modules);
     };
 })();
+(()=>{
+    __webpack_require__.n = (module)=>{
+        var getter = module && module.__esModule ? ()=>module['default'] : ()=>module;
+        __webpack_require__.d(getter, {
+            a: getter
+        });
+        return getter;
+    };
+})();
 (()=>{
     var getProto = Object.getPrototypeOf ? (obj)=>Object.getPrototypeOf(obj) : (obj)=>obj.__proto__;
     var leafPrototypes;

package/dist/server.d.ts

@@ -7,8 +7,9 @@
  * Copyright (c) JS Foundation and other contributors
  * https://github.com/webpack/webpack-dev-server/blob/main/LICENSE
  */
-import type { BasicApplication, ClientConfiguration, ClientConnection, Compiler, ConnectHistoryApiFallbackOptions, DevMiddlewareContext, DevMiddlewareOptions, DevServer, EXPECTED_ANY, ExpressApplication, FSWatcher, HTTPServer, Headers, Host, LiteralUnion, Middleware, MultiCompiler, MultiStats, NextFunction, Open, Port, ProxyConfigArray, Request, RequestHandler, Response, ServerConfiguration, ServerType, Socket, Static, Stats, StatsCompilation, StatsOptions, WatchFiles, WatchOptions, WebSocketServerConfiguration, WebSocketServerImplementation } from './types';
-export interface Configuration<A extends BasicApplication = ExpressApplication, S extends HTTPServer = HTTPServer> {
+import type { BasicApplication, ClientConfiguration, ClientConnection, Compiler, ConnectHistoryApiFallbackOptions, DevMiddlewareContext, DevMiddlewareOptions, DevServer, EXPECTED_ANY, FSWatcher, HTTPServer, Headers, Host, LiteralUnion, Middleware, MultiCompiler, MultiStats, NextFunction, Open, Port, ProxyConfigArray, Request, RequestHandler, Response, ServerConfiguration, ServerType, Socket, Static, Stats, StatsCompilation, StatsOptions, WatchFiles, WatchOptions, WebSocketServerConfiguration, WebSocketServerImplementation } from './types';
+import type { ConnectApplication } from './types';
+export interface Configuration<A extends BasicApplication = ConnectApplication, S extends HTTPServer = HTTPServer> {
     ipc?: boolean | string;
     host?: Host;
     port?: Port;
@@ -31,7 +32,7 @@ export interface Configuration<A extends BasicApplication = ExpressApplication,
     onListening?: (devServer: Server<A, S>) => void;
     setupMiddlewares?: (middlewares: Middleware[], devServer: Server<A, S>) => Middleware[];
 }
-declare class Server<A extends BasicApplication = ExpressApplication, S extends import('http').Server = HTTPServer> {
+declare class Server<A extends BasicApplication = ConnectApplication, S extends import('http').Server = HTTPServer> {
     compiler: Compiler | MultiCompiler;
     logger: ReturnType<Compiler['getInfrastructureLogger']>;
     options: Configuration<A, S>;

package/dist/types.d.ts

@@ -6,10 +6,10 @@ export type { NetworkInterfaceInfo } from 'node:os';
 export type { Compiler, DevServer, MultiCompiler, MultiStats, Stats, StatsCompilation, StatsOptions, } from '@rspack/core';
 import type { FSWatcher, WatchOptions } from 'chokidar';
 export type { FSWatcher, WatchOptions };
+import type { Server as ConnectApplication, IncomingMessage as ConnectIncomingMessage } from 'connect-next';
+export type { ConnectApplication };
 import type { Options as ConnectHistoryApiFallbackOptions } from 'connect-history-api-fallback';
 export type { ConnectHistoryApiFallbackOptions };
-import type { Application as ExpressApplication, ErrorRequestHandler as ExpressErrorRequestHandler, Request as ExpressRequest, RequestHandler as ExpressRequestHandler, Response as ExpressResponse } from 'express';
-export type { ExpressApplication };
 import type { Options as HttpProxyMiddlewareOptions, Filter as HttpProxyMiddlewareOptionsFilter, RequestHandler } from 'http-proxy-middleware';
 export type { RequestHandler };
 export type { IPv6 } from 'ipaddr.js';
@@ -25,8 +25,8 @@ export type NextHandleFunction = (req: IncomingMessage, res: ServerResponse, nex
 export type ErrorHandleFunction = (err: EXPECTED_ANY, req: IncomingMessage, res: ServerResponse, next: NextFunction) => void;
 export type HandleFunction = SimpleHandleFunction | NextHandleFunction | ErrorHandleFunction;
 export type ServerOptions = import('https').ServerOptions;
-export type Request<T extends BasicApplication = ExpressApplication> = T extends ExpressApplication ? ExpressRequest : IncomingMessage;
-export type Response<T extends BasicApplication = ExpressApplication> = T extends ExpressApplication ? ExpressResponse : ServerResponse;
+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>;
@@ -57,8 +57,8 @@ export interface NormalizedStatic {
     staticOptions: ServeStaticOptions;
     watch: false | WatchOptions;
 }
-export type ServerType<A extends BasicApplication = ExpressApplication, S extends import('http').Server = import('http').Server> = LiteralUnion<'http' | 'https' | 'http2', string> | ((serverOptions: ServerOptions, application: A) => S);
-export interface ServerConfiguration<A extends BasicApplication = ExpressApplication, S extends import('http').Server = import('http').Server> {
+export type ServerType<A extends BasicApplication = ConnectApplication, S extends import('http').Server = import('http').Server> = LiteralUnion<'http' | 'https' | 'http2', string> | ((serverOptions: ServerOptions, application: A) => S);
+export interface ServerConfiguration<A extends BasicApplication = ConnectApplication, S extends import('http').Server = import('http').Server> {
     type?: ServerType<A, S>;
     options?: ServerOptions;
 }
@@ -118,13 +118,13 @@ export type Headers = Array<{
     key: string;
     value: string;
 }> | Record<string, string | string[]>;
-export type MiddlewareHandler<T extends BasicApplication = ExpressApplication> = T extends ExpressApplication ? ExpressRequestHandler | ExpressErrorRequestHandler : HandleFunction;
-export interface MiddlewareObject<T extends BasicApplication = ExpressApplication> {
+export type MiddlewareHandler = (...args: EXPECTED_ANY[]) => EXPECTED_ANY;
+export interface MiddlewareObject {
     name?: string;
     path?: string;
-    middleware: MiddlewareHandler<T>;
+    middleware: MiddlewareHandler;
 }
-export type Middleware<T extends BasicApplication = ExpressApplication> = MiddlewareObject<T> | MiddlewareHandler<T>;
+export type Middleware = MiddlewareObject | MiddlewareHandler;
 export type BasicServer = import('net').Server | import('tls').Server;
 export type OverlayMessageOptions = boolean | ((error: Error) => void);
 declare function useFn(fn: NextHandleFunction): BasicApplication;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack/dev-server",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.4",
   "description": "Development server for rspack",
   "homepage": "https://rspack.rs",
   "bugs": "https://github.com/rstackjs/rspack-dev-server/issues",
@@ -51,39 +51,38 @@
     "@types/ws": "^8.18.1",
     "chokidar": "^3.6.0",
     "connect-history-api-fallback": "^2.0.0",
-    "express": "^5.2.1",
+    "connect-next": "^4.0.0",
     "http-proxy-middleware": "^3.0.5",
     "ipaddr.js": "^2.3.0",
     "serve-index": "^1.9.2",
+    "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.9",
+    "@hono/node-server": "^1.19.11",
     "@rslib/core": "^0.19.6",
     "@rspack/core": "2.0.0-beta.5",
     "@rspack/plugin-react-refresh": "1.6.1",
-    "@rstest/core": "^0.8.5",
-    "@types/compression": "^1.8.1",
-    "@types/express": "5.0.6",
+    "@rstest/core": "^0.9.0",
     "@types/mime-types": "3.0.1",
-    "@types/node": "^24.11.0",
+    "@types/node": "^24.12.0",
     "@types/node-forge": "^1.3.14",
     "@types/trusted-types": "^2.0.7",
     "@types/ws": "8.18.1",
-    "compression": "^1.8.1",
-    "connect": "^3.7.0",
     "cross-env": "^10.1.0",
     "css-loader": "^7.1.4",
-    "hono": "^4.12.3",
+    "express": "^5.2.1",
+    "hono": "^4.12.5",
+    "http-compression": "^1.1.2",
     "http-proxy": "^1.18.1",
     "launch-editor": "^2.13.1",
     "nano-staged": "^0.9.0",
     "open": "^11.0.0",
     "p-retry": "^7.1.1",
     "prettier": "3.8.1",
-    "puppeteer": "^24.37.5",
+    "puppeteer": "^24.38.0",
     "react-refresh": "0.18.0",
     "require-from-string": "^2.0.2",
     "selfsigned": "^5.5.0",
@@ -101,7 +100,7 @@
       "optional": true
     }
   },
-  "packageManager": "pnpm@10.30.3",
+  "packageManager": "pnpm@10.31.0",
   "engines": {
     "node": "^20.19.0 || >=22.12.0"
   },