@rspack/dev-server 1.1.0 → 1.1.2

package/client/index.js

@@ -18,7 +18,6 @@ import webpackHotLog from "@rspack/core/hot/log.js";
 import { createOverlay, formatProblem, } from "webpack-dev-server/client/overlay.js";
 import socket from "webpack-dev-server/client/socket.js";
 import { defineProgressElement, isProgressSupported, } from "webpack-dev-server/client/progress.js";
-import socket from "webpack-dev-server/client/socket.js";
 import { log, setLogLevel } from "webpack-dev-server/client/utils/log.js";
 import sendMessage from "webpack-dev-server/client/utils/sendMessage.js";
 /**
@@ -157,7 +156,7 @@ if (parsedResourceQuery.overlay) {
         options.overlay = __assign({ errors: true, warnings: true, runtimeErrors: true }, options.overlay);
         decodeOverlayOptions(options.overlay);
     }
-    enabledFeatures.Overlay = true;
+    enabledFeatures.Overlay = options.overlay !== false;
 }
 if (parsedResourceQuery.logging) {
     options.logging = parsedResourceQuery.logging;

package/dist/config.d.ts

@@ -11,7 +11,7 @@ export interface ResolvedDevServer extends DevServer {
     magicHtml: boolean;
     liveReload: boolean;
     webSocketServer: false | WebpackDevServer.WebSocketServerConfiguration;
-    proxy: WebpackDevServer.ProxyConfigArray;
+    proxy: Required<DevServer["proxy"]>;
     client: WebpackDevServer.ClientConfiguration;
     allowedHosts: "auto" | string[] | "all";
     bonjour: false | Record<string, never> | WebpackDevServer.BonjourOptions;

package/dist/server.d.ts

@@ -20,6 +20,7 @@ export declare class RspackDevServer extends WebpackDevServer {
     /**
      * resolved after `normalizedOptions`
      */
+    /** @ts-ignore: types of path data of rspack is not compatible with webpack */
     options: ResolvedDevServer;
     staticWatchers: FSWatcher[];
     sockets: Socket[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack/dev-server",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "license": "MIT",
   "description": "Development server for rspack",
   "main": "./dist/index.js",
@@ -76,17 +76,16 @@
     "ts-jest": "29.1.2",
     "typescript": "5.0.2",
     "wait-for-expect": "^3.0.2",
-    "webpack": "^5.94.0"
+    "webpack": "^5.94.0",
+    "webpack-dev-middleware": "^7.4.2",
+    "express": "^4.21.2"
   },
   "dependencies": {
     "chokidar": "^3.6.0",
-    "express": "^4.19.2",
-    "http-proxy-middleware": "^2.0.6",
-    "mime-types": "^2.1.35",
+    "http-proxy-middleware": "^2.0.7",
     "p-retry": "^6.2.0",
-    "webpack-dev-middleware": "^7.4.2",
     "webpack-dev-server": "5.2.0",
-    "ws": "^8.16.0"
+    "ws": "^8.18.0"
   },
   "peerDependencies": {
     "@rspack/core": "*"

package/dist/middleware.d.ts

@@ -1,4 +0,0 @@
-import type { Compiler } from "@rspack/core";
-import type { RequestHandler } from "express";
-import type wdm from "webpack-dev-middleware";
-export declare function getRspackMemoryAssets(compiler: Compiler, rdm: ReturnType<typeof wdm>): RequestHandler;

package/dist/middleware.js

@@ -1,77 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRspackMemoryAssets = void 0;
-const node_crypto_1 = __importDefault(require("node:crypto"));
-const node_path_1 = require("node:path");
-const node_url_1 = require("node:url");
-const mime_types_1 = __importDefault(require("mime-types"));
-// biome-ignore lint/suspicious/noExplicitAny: _
-function etag(buf) {
-    const hash = node_crypto_1.default.createHash("sha256").update(buf).digest("hex");
-    const etag = hash;
-    return etag;
-}
-function createPublicPathGetter(compiler) {
-    const raw = compiler.options.output.publicPath || "/";
-    if (typeof raw === "function") {
-        return (compilation) => compilation ? compilation.getPath(raw) : raw({ hash: "XXXX" }, undefined);
-    }
-    if (/\[(hash|fullhash)[:\]]/.test(raw)) {
-        return (compilation) => compilation ? compilation.getPath(raw) : `${raw.replace(/\/$/, "")}/`;
-    }
-    return () => `${raw.replace(/\/$/, "")}/`;
-}
-function getRspackMemoryAssets(compiler, rdm) {
-    const getPublicPath = createPublicPathGetter(compiler);
-    return (req, res, next) => {
-        const { method, url } = req;
-        if (method !== "GET") {
-            return next();
-        }
-        // css hmr will append query string, so here need to remove query string
-        // @ts-expect-error
-        const path = (0, node_url_1.parse)(url).pathname;
-        const publicPath = getPublicPath(compiler._lastCompilation);
-        // asset name is not start with /, so path need to slice 1
-        // @ts-expect-error
-        const filename = path.startsWith(publicPath)
-            ? // @ts-expect-error
-                path.slice(publicPath.length)
-            : // @ts-expect-error
-                path.slice(1);
-        const buffer = compiler._lastCompilation?.getAsset(filename) ??
-            (() => {
-                const { index } = rdm.context.options;
-                const indexValue = typeof index === "undefined" || typeof index === "boolean"
-                    ? "index.html"
-                    : index;
-                return compiler._lastCompilation?.getAsset(filename + indexValue);
-            })();
-        if (!buffer) {
-            return next();
-        }
-        let contentType;
-        if (filename === "") {
-            contentType = "text/html; charset=utf-8";
-        }
-        else {
-            contentType =
-                // @ts-expect-error
-                mime_types_1.default.contentType((0, node_path_1.extname)(path)) || "text/plain; charset=utf-8";
-        }
-        const calcEtag = etag(buffer);
-        const oldEtag = req.headers["if-none-match"];
-        res.setHeader("Content-Type", contentType);
-        res.setHeader("ETag", calcEtag);
-        if (calcEtag === oldEtag) {
-            res.status(304).send();
-        }
-        else {
-            res.send(buffer);
-        }
-    };
-}
-exports.getRspackMemoryAssets = getRspackMemoryAssets;