@rspack/dev-server 0.3.2 → 0.3.3-canary-0f5a67f-20230913040612

package/dist/patch.d.ts

@@ -0,0 +1,3 @@
+declare function restoreDevServerPatch(): void;
+declare function applyDevServerPatch(): typeof restoreDevServerPatch;
+export { applyDevServerPatch };

package/dist/patch.js

@@ -0,0 +1,30 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.applyDevServerPatch = void 0;
+const webpack_dev_server_1 = __importDefault(require("webpack-dev-server"));
+let old;
+function restoreDevServerPatch() {
+    // @ts-expect-error private API
+    webpack_dev_server_1.default.prototype.sendStats = old;
+}
+// Patch webpack-dev-server to prevent it from failing to send stats.
+// See https://github.com/web-infra-dev/rspack/pull/4028 for details.
+function applyDevServerPatch() {
+    if (old)
+        return restoreDevServerPatch;
+    // @ts-expect-error private API
+    old = webpack_dev_server_1.default.prototype.sendStats;
+    // @ts-expect-error private API
+    webpack_dev_server_1.default.prototype.sendStats = function sendStats__rspack_patched(...args) {
+        let stats = args[1];
+        if (!stats) {
+            return;
+        }
+        return old.apply(this, args);
+    };
+    return restoreDevServerPatch;
+}
+exports.applyDevServerPatch = applyDevServerPatch;

package/dist/server.d.ts

@@ -26,7 +26,6 @@ export declare class RspackDevServer extends WebpackDevServer {
     compiler: Compiler | MultiCompiler;
     webSocketServer: WebpackDevServer.WebSocketServerImplementation | undefined;
     constructor(options: DevServer, compiler: Compiler | MultiCompiler);
-    addAdditionalEntries(compiler: Compiler): void;
     getClientTransport(): string;
     initialize(): Promise<void>;
     private setupDevMiddleware;

package/dist/server.js

@@ -16,10 +16,11 @@ exports.RspackDevServer = void 0;
 const core_1 = require("@rspack/core");
 const webpack_dev_middleware_1 = __importDefault(require("webpack-dev-middleware"));
 const fs_1 = __importDefault(require("fs"));
+const plugin_react_refresh_1 = __importDefault(require("@rspack/plugin-react-refresh"));
 const webpack_dev_server_1 = __importDefault(require("webpack-dev-server"));
 const middleware_1 = require("./middleware");
-// @ts-expect-error
-const runtime_paths_1 = require("@rspack/dev-client/runtime-paths");
+const patch_1 = require("./patch");
+(0, patch_1.applyDevServerPatch)();
 class RspackDevServer extends webpack_dev_server_1.default {
     constructor(options, compiler) {
         super({
@@ -49,137 +50,6 @@ class RspackDevServer extends webpack_dev_server_1.default {
             }
         }, compiler);
     }
-    addAdditionalEntries(compiler) {
-        var _a;
-        const additionalEntries = [];
-        // @ts-expect-error
-        const isWebTarget = webpack_dev_server_1.default.isWebTarget(compiler);
-        // inject runtime first, avoid other additional entry after transfrom depend on it
-        const clientPath = require.resolve("webpack-dev-server/client/index.js");
-        if (this.options.hot) {
-            if ((_a = compiler.options.builtins.react) === null || _a === void 0 ? void 0 : _a.refresh) {
-                const reactRefreshEntryPath = require.resolve("@rspack/dev-client/react-refresh-entry");
-                additionalEntries.push(reactRefreshEntryPath);
-            }
-            // #3356 make sure resolve webpack/hot/dev-server from webpack-dev-server
-            const hotUpdateEntryPath = require.resolve("webpack/hot/dev-server", {
-                paths: [clientPath]
-            });
-            additionalEntries.push(hotUpdateEntryPath);
-        }
-        if (this.options.client && isWebTarget) {
-            let webSocketURLStr = "";
-            if (this.options.webSocketServer) {
-                const webSocketURL = this.options.client
-                    .webSocketURL;
-                const webSocketServer = this.options.webSocketServer;
-                const searchParams = new URLSearchParams();
-                let protocol;
-                // We are proxying dev server and need to specify custom `hostname`
-                if (typeof webSocketURL.protocol !== "undefined") {
-                    protocol = webSocketURL.protocol;
-                }
-                else {
-                    protocol = this.options.server.type === "http" ? "ws:" : "wss:";
-                }
-                searchParams.set("protocol", protocol);
-                if (typeof webSocketURL.username !== "undefined") {
-                    searchParams.set("username", webSocketURL.username);
-                }
-                if (typeof webSocketURL.password !== "undefined") {
-                    searchParams.set("password", webSocketURL.password);
-                }
-                let hostname;
-                // SockJS is not supported server mode, so `hostname` and `port` can't specified, let's ignore them
-                // TODO show warning about this
-                const isSockJSType = webSocketServer.type === "sockjs";
-                // We are proxying dev server and need to specify custom `hostname`
-                if (typeof webSocketURL.hostname !== "undefined") {
-                    hostname = webSocketURL.hostname;
-                }
-                // Web socket server works on custom `hostname`, only for `ws` because `sock-js` is not support custom `hostname`
-                else if (typeof webSocketServer.options.host !== "undefined" &&
-                    !isSockJSType) {
-                    hostname = webSocketServer.options.host;
-                }
-                // The `host` option is specified
-                else if (typeof this.options.host !== "undefined") {
-                    hostname = this.options.host;
-                }
-                // The `port` option is not specified
-                else {
-                    hostname = "0.0.0.0";
-                }
-                searchParams.set("hostname", hostname);
-                let port;
-                // We are proxying dev server and need to specify custom `port`
-                if (typeof webSocketURL.port !== "undefined") {
-                    port = webSocketURL.port;
-                }
-                // Web socket server works on custom `port`, only for `ws` because `sock-js` is not support custom `port`
-                else if (typeof webSocketServer.options.port !== "undefined" &&
-                    !isSockJSType) {
-                    port = webSocketServer.options.port;
-                }
-                // The `port` option is specified
-                else if (typeof this.options.port === "number") {
-                    port = this.options.port;
-                }
-                // The `port` option is specified using `string`
-                else if (typeof this.options.port === "string" &&
-                    this.options.port !== "auto") {
-                    port = Number(this.options.port);
-                }
-                // The `port` option is not specified or set to `auto`
-                else {
-                    port = "0";
-                }
-                searchParams.set("port", String(port));
-                let pathname = "";
-                // We are proxying dev server and need to specify custom `pathname`
-                if (typeof webSocketURL.pathname !== "undefined") {
-                    pathname = webSocketURL.pathname;
-                }
-                // Web socket server works on custom `path`
-                else if (typeof webSocketServer.options.prefix !== "undefined" ||
-                    typeof webSocketServer.options.path !== "undefined") {
-                    pathname =
-                        webSocketServer.options.prefix || webSocketServer.options.path;
-                }
-                searchParams.set("pathname", pathname);
-                const client = /** @type {ClientConfiguration} */ this.options.client;
-                if (typeof client.logging !== "undefined") {
-                    searchParams.set("logging", client.logging);
-                }
-                if (typeof client.progress !== "undefined") {
-                    searchParams.set("progress", String(client.progress));
-                }
-                if (typeof client.overlay !== "undefined") {
-                    searchParams.set("overlay", typeof client.overlay === "boolean"
-                        ? String(client.overlay)
-                        : JSON.stringify(client.overlay));
-                }
-                if (typeof client.reconnect !== "undefined") {
-                    searchParams.set("reconnect", typeof client.reconnect === "number"
-                        ? String(client.reconnect)
-                        : "10");
-                }
-                if (typeof this.options.hot !== "undefined") {
-                    searchParams.set("hot", String(this.options.hot));
-                }
-                if (typeof this.options.liveReload !== "undefined") {
-                    searchParams.set("live-reload", String(this.options.liveReload));
-                }
-                webSocketURLStr = searchParams.toString();
-            }
-            additionalEntries.push(`${clientPath}?${webSocketURLStr}`);
-        }
-        for (const additionalEntry of additionalEntries) {
-            new compiler.webpack.EntryPlugin(compiler.context, additionalEntry, {
-                name: undefined
-            }).apply(compiler);
-        }
-    }
     getClientTransport() {
         // WARNING: we can't use `super.getClientTransport`,
         // because we doesn't had same directory structure.
@@ -239,23 +109,20 @@ class RspackDevServer extends webpack_dev_server_1.default {
             ? this.compiler.compilers
             : [this.compiler];
         compilers.forEach(compiler => {
-            var _a, _b, _c, _d, _e, _f;
-            var _g, _h, _j, _k, _l, _m;
+            var _a, _b, _c, _d;
+            var _e, _f, _g, _h;
             const mode = compiler.options.mode || process.env.NODE_ENV;
             if (this.options.hot) {
                 if (mode === "production") {
                     this.logger.warn("Hot Module Replacement (HMR) is enabled for the production build. \n" +
                         "Make sure to disable HMR for production by setting `devServer.hot` to `false` in the configuration.");
                 }
-                (_a = (_g = compiler.options).devServer) !== null && _a !== void 0 ? _a : (_g.devServer = {});
+                (_a = (_e = compiler.options).devServer) !== null && _a !== void 0 ? _a : (_e.devServer = {});
                 compiler.options.devServer.hot = true;
-                (_b = (_h = compiler.options.builtins).react) !== null && _b !== void 0 ? _b : (_h.react = {});
-                (_c = (_j = compiler.options.builtins.react).refresh) !== null && _c !== void 0 ? _c : (_j.refresh = true);
-                (_d = (_k = compiler.options.builtins.react).development) !== null && _d !== void 0 ? _d : (_k.development = true);
-                (_e = (_l = compiler.options.builtins).provide) !== null && _e !== void 0 ? _e : (_l.provide = {});
-                (_f = (_m = compiler.options.builtins.provide).$ReactRefreshRuntime$) !== null && _f !== void 0 ? _f : (_m.$ReactRefreshRuntime$ = [
-                    require.resolve("@rspack/dev-client/react-refresh")
-                ]);
+                (_b = (_f = compiler.options.builtins).react) !== null && _b !== void 0 ? _b : (_f.react = {});
+                (_c = (_g = compiler.options.builtins.react).refresh) !== null && _c !== void 0 ? _c : (_g.refresh = true);
+                (_d = (_h = compiler.options.builtins.react).development) !== null && _d !== void 0 ? _d : (_h.development = true);
+                new plugin_react_refresh_1.default().apply(compiler);
             }
             else if (compiler.options.builtins.react.refresh) {
                 if (mode === "production") {
@@ -269,18 +136,11 @@ class RspackDevServer extends webpack_dev_server_1.default {
         });
         if (this.options.webSocketServer) {
             compilers.forEach(compiler => {
+                // @ts-expect-error: `addAdditionalEntries` is private function in base class.
                 this.addAdditionalEntries(compiler);
-                if (this.options.hot) {
-                    console.log(runtime_paths_1.runtimePaths);
-                    compiler.options.module.rules.push({
-                        include: runtime_paths_1.runtimePaths,
-                        type: "js"
-                    });
-                }
-                compiler.options.builtins.provide = {
-                    ...compiler.options.builtins.provide,
-                    __webpack_dev_server_client__: [this.getClientTransport()]
-                };
+                new compiler.webpack.ProvidePlugin({
+                    __webpack_dev_server_client__: this.getClientTransport()
+                }).apply(compiler);
             });
         }
         // @ts-expect-error: `setupHooks` is private function in base class.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack/dev-server",
-  "version": "0.3.2",
+  "version": "0.3.3-canary-0f5a67f-20230913040612",
   "license": "MIT",
   "description": "Development server for rspack",
   "main": "./dist/index.js",
@@ -28,7 +28,7 @@
     "@types/ws": "8.5.3",
     "fs-extra": "11.1.0",
     "puppeteer": "19.4.0",
-    "@rspack/core": "0.3.2"
+    "@rspack/core": "0.3.3-canary-0f5a67f-20230913040612"
   },
   "dependencies": {
     "chokidar": "3.5.3",
@@ -40,8 +40,8 @@
     "webpack-dev-middleware": "6.0.2",
     "webpack-dev-server": "4.13.1",
     "ws": "8.8.1",
-    "@rspack/dev-client": "0.3.2",
-    "@rspack/dev-server": "0.3.2"
+    "@rspack/dev-server": "0.3.3-canary-0f5a67f-20230913040612",
+    "@rspack/plugin-react-refresh": "0.3.3-canary-0f5a67f-20230913040612"
   },
   "peerDependencies": {
     "@rspack/core": "*"