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

package/dist/getPort.d.ts

@@ -7,4 +7,7 @@
  * Copyright (c) JS Foundation and other contributors
  * https://github.com/webpack/webpack-dev-server/blob/main/LICENSE
  */
-export {};
+/**
+ * Get available ports
+ */
+export declare function getPort(basePort: number, host?: string): Promise<number>;

package/dist/index.js

@@ -1,5 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RspackDevServer = void 0;
-var server_1 = require("./server");
-Object.defineProperty(exports, "RspackDevServer", { enumerable: true, get: function () { return server_1.Server; } });
+export { RspackDevServer } from "./131.js";

package/dist/rslib-runtime.js

@@ -0,0 +1,66 @@
+var __webpack_modules__ = {};
+var __webpack_module_cache__ = {};
+function __webpack_require__(moduleId) {
+    var cachedModule = __webpack_module_cache__[moduleId];
+    if (void 0 !== cachedModule) return cachedModule.exports;
+    var module = __webpack_module_cache__[moduleId] = {
+        exports: {}
+    };
+    __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
+    return module.exports;
+}
+__webpack_require__.m = __webpack_modules__;
+(()=>{
+    __webpack_require__.add = function(modules) {
+        Object.assign(__webpack_require__.m, modules);
+    };
+})();
+(()=>{
+    var getProto = Object.getPrototypeOf ? (obj)=>Object.getPrototypeOf(obj) : (obj)=>obj.__proto__;
+    var leafPrototypes;
+    __webpack_require__.t = function(value, mode) {
+        if (1 & mode) value = this(value);
+        if (8 & mode) return value;
+        if ('object' == typeof value && value) {
+            if (4 & mode && value.__esModule) return value;
+            if (16 & mode && 'function' == typeof value.then) return value;
+        }
+        var ns = Object.create(null);
+        __webpack_require__.r(ns);
+        var def = {};
+        leafPrototypes = leafPrototypes || [
+            null,
+            getProto({}),
+            getProto([]),
+            getProto(getProto)
+        ];
+        for(var current = 2 & mode && value; ('object' == typeof current || 'function' == typeof current) && !~leafPrototypes.indexOf(current); current = getProto(current))Object.getOwnPropertyNames(current).forEach((key)=>{
+            def[key] = ()=>value[key];
+        });
+        def['default'] = ()=>value;
+        __webpack_require__.d(ns, def);
+        return ns;
+    };
+})();
+(()=>{
+    __webpack_require__.d = (exports, definition)=>{
+        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) Object.defineProperty(exports, key, {
+            enumerable: true,
+            get: definition[key]
+        });
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports)=>{
+        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports, '__esModule', {
+            value: true
+        });
+    };
+})();
+export { __webpack_require__ };

package/dist/server.d.ts

@@ -7,7 +7,7 @@
  * 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, 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 { 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> {
     ipc?: boolean | string;
     host?: Host;
@@ -16,13 +16,13 @@ export interface Configuration<A extends BasicApplication = ExpressApplication,
     liveReload?: boolean;
     devMiddleware?: DevMiddlewareOptions<Request, Response>;
     compress?: boolean;
-    allowedHosts?: 'auto' | 'all' | string | string[];
+    allowedHosts?: LiteralUnion<'auto' | 'all', string> | string[];
     historyApiFallback?: boolean | ConnectHistoryApiFallbackOptions;
     watchFiles?: string | string[] | WatchFiles | Array<string | WatchFiles>;
     static?: boolean | string | Static | Array<string | Static>;
     server?: ServerType<A, S> | ServerConfiguration<A, S>;
     app?: () => Promise<A>;
-    webSocketServer?: boolean | 'ws' | string | WebSocketServerConfiguration;
+    webSocketServer?: boolean | LiteralUnion<'ws', string> | WebSocketServerConfiguration;
     proxy?: ProxyConfigArray;
     open?: boolean | string | Open | Array<string | Open>;
     setupExitSignals?: boolean;
@@ -54,14 +54,14 @@ declare class Server<A extends BasicApplication = ExpressApplication, S extends
     static isAbsoluteURL(URL: string): boolean;
     static findIp(gatewayOrFamily: string, isInternal: boolean): string | undefined;
     static getHostname(hostname: Host): Promise<string>;
-    static getFreePort(port: string, host: string): Promise<any>;
+    static getFreePort(port: string, host: string): Promise<string | number>;
     static findCacheDir(): string;
     addAdditionalEntries(compiler: Compiler): void;
     /**
      * @private
      * @returns {Compiler["options"]} compiler options
      */
-    getCompilerOptions(): import("@rspack/core", { with: { "resolution-mode": "import" } }).RspackOptionsNormalized;
+    getCompilerOptions(): import("@rspack/core").RspackOptionsNormalized;
     shouldLogInfrastructureInfo(): boolean;
     normalizeOptions(): Promise<void>;
     /**
@@ -69,7 +69,7 @@ declare class Server<A extends BasicApplication = ExpressApplication, S extends
      * @returns {string} client transport
      */
     getClientTransport(): string;
-    getServerTransport(): typeof import("./servers/WebsocketServer") | undefined;
+    getServerTransport(): unknown;
     getClientEntry(): string;
     getClientHotEntry(): string | undefined;
     setupProgressPlugin(): void;
@@ -83,7 +83,7 @@ declare class Server<A extends BasicApplication = ExpressApplication, S extends
     setupHooks(): void;
     setupWatchStaticFiles(): void;
     setupWatchFiles(): void;
-    setupMiddlewares(): void;
+    setupMiddlewares(): Promise<void>;
     /**
      * @private
      * @returns {Promise<void>}

package/dist/servers/WebsocketServer.d.ts

@@ -7,4 +7,11 @@
  * Copyright (c) JS Foundation and other contributors
  * https://github.com/webpack/webpack-dev-server/blob/main/LICENSE
  */
-export {};
+import * as Ws from 'ws';
+import type { Server } from '../server';
+import BaseServer from './BaseServer';
+export declare class WebsocketServer extends BaseServer {
+    static heartbeatInterval: number;
+    implementation: Ws.WebSocketServer;
+    constructor(server: Server);
+}

package/dist/types.d.ts

@@ -17,6 +17,8 @@ import type { Options as ServeIndexOptions } from 'serve-index';
 export type { ServeIndexOptions };
 import type { ServeStaticOptions } from 'serve-static';
 export type EXPECTED_ANY = any;
+/** 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;
@@ -27,8 +29,8 @@ export type Request<T extends BasicApplication = ExpressApplication> = T extends
 export type Response<T extends BasicApplication = ExpressApplication> = T extends ExpressApplication ? ExpressResponse : 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 = 'local-ip' | 'local-ipv4' | 'local-ipv6' | string;
-export type Port = number | string | 'auto';
+export type Host = LiteralUnion<'local-ip' | 'local-ipv4' | 'local-ipv6', string>;
+export type Port = number | LiteralUnion<'auto', string>;
 export interface WatchFiles {
     paths: string | string[];
     options?: WatchOptions & {
@@ -55,13 +57,13 @@ export interface NormalizedStatic {
     staticOptions: ServeStaticOptions;
     watch: false | WatchOptions;
 }
-export type ServerType<A extends BasicApplication = ExpressApplication, S extends import('http').Server = import('http').Server> = 'http' | 'https' | 'http2' | string | ((serverOptions: ServerOptions, application: A) => S);
+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> {
     type?: ServerType<A, S>;
     options?: ServerOptions;
 }
 export interface WebSocketServerConfiguration {
-    type?: 'ws' | string | (() => WebSocketServerConfiguration);
+    type?: LiteralUnion<'ws', string> | (() => WebSocketServerConfiguration);
     options?: Record<string, EXPECTED_ANY>;
 }
 export type ClientConnection = import('ws').WebSocket & {
@@ -109,7 +111,7 @@ export interface ClientConfiguration {
     };
     progress?: boolean;
     reconnect?: boolean | number;
-    webSocketTransport?: 'ws' | string;
+    webSocketTransport?: LiteralUnion<'ws', string>;
     webSocketURL?: string | WebSocketURL;
 }
 export type Headers = Array<{

package/package.json

@@ -1,38 +1,36 @@
 {
   "name": "@rspack/dev-server",
-  "version": "2.0.0-beta.1",
-  "license": "MIT",
+  "version": "2.0.0-beta.2",
   "description": "Development server for rspack",
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
-  "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org/"
+  "homepage": "https://rspack.rs",
+  "bugs": "https://github.com/rstackjs/rspack-dev-server/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/rstackjs/rspack-dev-server"
   },
+  "license": "MIT",
+  "type": "module",
   "exports": {
-    ".": {
-      "default": "./dist/index.js"
-    },
-    "./getPort": "./getPort.js",
-    "./servers/*": "./servers/*.js",
-    "./servers/*.js": "./servers/*.js",
-    "./client/*": "./client/*.js",
+    ".": "./dist/index.js",
     "./client/*.js": "./client/*.js",
+    "./client/*": "./client/*.js",
     "./package.json": "./package.json"
   },
+  "types": "./dist/index.d.ts",
+  "files": [
+    "dist",
+    "client"
+  ],
   "scripts": {
-    "build": "pnpm run build:server && pnpm run build:client && pnpm run build:client-modules",
-    "build:server": "tsc -b ./tsconfig.build.json",
-    "build:client": "tsc -b ./tsconfig.client.json",
-    "build:client-modules": "node ./scripts/build-client-modules.cjs",
-    "dev": "tsc -b -w",
+    "build": "rslib",
+    "bump": "npx bumpp",
+    "dev": "rslib -w",
+    "format": "prettier --write .",
     "lint": "biome check .",
     "lint:write": "biome check . --write",
-    "format": "prettier --write .",
     "prettier:ci": "prettier --check .",
-    "test:install": "cross-env ./node_modules/.bin/puppeteer browsers install chrome",
     "test": "pnpm run test:install && pnpm run build && rstest",
-    "bump": "npx bumpp"
+    "test:install": "cross-env ./node_modules/.bin/puppeteer browsers install chrome"
   },
   "simple-git-hooks": {
     "pre-commit": "npx nano-staged"
@@ -46,23 +44,24 @@
       "biome lint --write --no-errors-on-unmatched"
     ]
   },
-  "files": [
-    "dist",
-    "client"
-  ],
-  "engines": {
-    "node": "^20.19.0 || >=22.12.0"
-  },
-  "packageManager": "pnpm@10.30.3",
-  "homepage": "https://rspack.rs",
-  "bugs": "https://github.com/rstackjs/rspack-dev-server/issues",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/rstackjs/rspack-dev-server"
+  "dependencies": {
+    "@types/connect-history-api-fallback": "^1.5.4",
+    "@types/serve-index": "^1.9.4",
+    "@types/serve-static": "^2.2.0",
+    "@types/ws": "^8.18.1",
+    "chokidar": "^3.6.0",
+    "connect-history-api-fallback": "^2.0.0",
+    "express": "^5.2.1",
+    "http-proxy-middleware": "^3.0.5",
+    "ipaddr.js": "^2.3.0",
+    "serve-index": "^1.9.2",
+    "webpack-dev-middleware": "^7.4.5",
+    "ws": "^8.19.0"
   },
   "devDependencies": {
     "@biomejs/biome": "^1.9.4",
     "@hono/node-server": "^1.19.9",
+    "@rslib/core": "^0.19.6",
     "@rspack/core": "2.0.0-beta.5",
     "@rspack/plugin-react-refresh": "1.6.1",
     "@rstest/core": "^0.8.5",
@@ -73,43 +72,41 @@
     "@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",
     "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",
     "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": "^5.105.3",
-    "webpack-dev-middleware": "^7.4.5",
-    "webpack-merge": "^6.0.1"
-  },
-  "dependencies": {
-    "@types/connect-history-api-fallback": "^1.5.4",
-    "@types/serve-index": "^1.9.4",
-    "@types/serve-static": "^2.2.0",
-    "@types/ws": "^8.18.1",
-    "chokidar": "^3.6.0",
-    "compression": "^1.8.1",
-    "connect-history-api-fallback": "^2.0.0",
-    "express": "^5.2.1",
-    "http-proxy-middleware": "^3.0.5",
-    "ipaddr.js": "^2.3.0",
-    "launch-editor": "^2.13.1",
-    "open": "^11.0.0",
-    "p-retry": "^7.1.1",
-    "selfsigned": "^5.5.0",
-    "serve-index": "^1.9.2",
-    "webpack-dev-middleware": "^7.4.5",
-    "ws": "^8.19.0"
+    "webpack-dev-middleware": "^7.4.5"
   },
   "peerDependencies": {
-    "@rspack/core": "^2.0.0-0"
+    "@rspack/core": "^2.0.0-0",
+    "selfsigned": "^5.0.0"
+  },
+  "peerDependenciesMeta": {
+    "selfsigned": {
+      "optional": true
+    }
+  },
+  "packageManager": "pnpm@10.30.3",
+  "engines": {
+    "node": "^20.19.0 || >=22.12.0"
+  },
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
   }
 }

package/dist/config.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/dist/getPort.js

@@ -1,141 +0,0 @@
-"use strict";
-/**
- * The following code is modified based on
- * https://github.com/webpack/webpack-dev-server
- *
- * MIT Licensed
- * Author Tobias Koppers @sokra
- * Copyright (c) JS Foundation and other contributors
- * https://github.com/webpack/webpack-dev-server/blob/main/LICENSE
- */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-/*
- * Based on the packages get-port https://www.npmjs.com/package/get-port
- * and portfinder https://www.npmjs.com/package/portfinder
- * The code structure is similar to get-port, but it searches
- * ports deterministically like portfinder
- */
-const net = __importStar(require("node:net"));
-const os = __importStar(require("node:os"));
-const minPort = 1024;
-const maxPort = 65_535;
-/**
- * Get all local hosts
- */
-const getLocalHosts = () => {
-    const interfaces = os.networkInterfaces();
-    // Add undefined value for createServer function to use default host,
-    // and default IPv4 host in case createServer defaults to IPv6.
-    const results = new Set([undefined, '0.0.0.0']);
-    for (const _interface of Object.values(interfaces)) {
-        if (_interface) {
-            for (const config of _interface) {
-                results.add(config.address);
-            }
-        }
-    }
-    return results;
-};
-/**
- * Check if a port is available on a given host
- */
-const checkAvailablePort = (basePort, host) => new Promise((resolve, reject) => {
-    const server = net.createServer();
-    server.unref();
-    server.on('error', reject);
-    server.listen(basePort, host, () => {
-        // Next line should return AddressInfo because we're calling it after listen() and before close()
-        const { port } = server.address();
-        server.close(() => {
-            resolve(port);
-        });
-    });
-});
-/**
- * Get available port from hosts
- */
-const getAvailablePort = async (port, hosts) => {
-    /**
-     * Errors that mean that host is not available.
-     */
-    const nonExistentInterfaceErrors = new Set(['EADDRNOTAVAIL', 'EINVAL']);
-    /* Check if the post is available on every local host name */
-    for (const host of hosts) {
-        try {
-            await checkAvailablePort(port, host);
-        }
-        catch (error) {
-            /* We throw an error only if the interface exists */
-            if (!nonExistentInterfaceErrors.has(error.code || '')) {
-                throw error;
-            }
-        }
-    }
-    return port;
-};
-/**
- * Get available ports
- */
-async function getPorts(basePort, host) {
-    if (basePort < minPort || basePort > maxPort) {
-        throw new Error(`Port number must lie between ${minPort} and ${maxPort}`);
-    }
-    let port = basePort;
-    const localhosts = getLocalHosts();
-    const hosts = host && !localhosts.has(host)
-        ? new Set([host])
-        : /* If the host is equivalent to localhost
-         we need to check every equivalent host
-         else the port might falsely appear as available
-         on some operating systems  */
-            localhosts;
-    const portUnavailableErrors = new Set(['EADDRINUSE', 'EACCES']);
-    while (port <= maxPort) {
-        try {
-            const availablePort = await getAvailablePort(port, hosts);
-            return availablePort;
-        }
-        catch (error) {
-            /* Try next port if port is busy; throw for any other error */
-            if (!portUnavailableErrors.has(error.code || '')) {
-                throw error;
-            }
-            port += 1;
-        }
-    }
-    throw new Error('No available ports found');
-}
-module.exports = getPorts;