From 74eef09f93ba5809673112f445203c4483c8d7c2 Mon Sep 17 00:00:00 2001 From: neverland Date: Fri, 6 Mar 2026 17:38:44 +0800 Subject: [PATCH 1/2] refactor: rename __webpack_dev_server_client__ --- client-src/socket.ts | 10 +++++----- src/server.ts | 2 +- tests/fixtures/provide-plugin-default/foo.js | 2 +- tests/fixtures/provide-plugin-ws-config/foo.js | 2 +- tests/fixtures/reload-config/main.css | 3 --- .../public/worker-bundle.js | 11 +++++++++++ 6 files changed, 19 insertions(+), 11 deletions(-) delete mode 100644 tests/fixtures/reload-config/main.css diff --git a/client-src/socket.ts b/client-src/socket.ts index 6f22ea9..ede1f85 100644 --- a/client-src/socket.ts +++ b/client-src/socket.ts @@ -17,25 +17,25 @@ import type { EXPECTED_ANY, } from './type.js'; -declare const __webpack_dev_server_client__: +declare const __rspack_dev_server_client__: | CommunicationClientConstructor | { default: CommunicationClientConstructor } | undefined; // this WebsocketClient is here as a default fallback, in case the client is not injected const Client: CommunicationClientConstructor = - typeof __webpack_dev_server_client__ !== 'undefined' + typeof __rspack_dev_server_client__ !== 'undefined' ? typeof ( - __webpack_dev_server_client__ as { + __rspack_dev_server_client__ as { default: CommunicationClientConstructor; } ).default !== 'undefined' ? ( - __webpack_dev_server_client__ as { + __rspack_dev_server_client__ as { default: CommunicationClientConstructor; } ).default - : (__webpack_dev_server_client__ as CommunicationClientConstructor) + : (__rspack_dev_server_client__ as CommunicationClientConstructor) : WebSocketClient; let retries = 0; diff --git a/src/server.ts b/src/server.ts index 1af43a3..a44d7c8 100644 --- a/src/server.ts +++ b/src/server.ts @@ -1423,7 +1423,7 @@ class Server< const { ProvidePlugin, HotModuleReplacementPlugin } = compiler.rspack; new ProvidePlugin({ - __webpack_dev_server_client__: this.getClientTransport() as + __rspack_dev_server_client__: this.getClientTransport() as | string | string[], }).apply(compiler); diff --git a/tests/fixtures/provide-plugin-default/foo.js b/tests/fixtures/provide-plugin-default/foo.js index 69d97ad..78a0366 100644 --- a/tests/fixtures/provide-plugin-default/foo.js +++ b/tests/fixtures/provide-plugin-default/foo.js @@ -6,4 +6,4 @@ const WebsocketClient = window.expectedClient = WebsocketClient; // eslint-disable-next-line camelcase, no-undef -window.injectedClient = __webpack_dev_server_client__.default; +window.injectedClient = __rspack_dev_server_client__.default; diff --git a/tests/fixtures/provide-plugin-ws-config/foo.js b/tests/fixtures/provide-plugin-ws-config/foo.js index 69d97ad..78a0366 100644 --- a/tests/fixtures/provide-plugin-ws-config/foo.js +++ b/tests/fixtures/provide-plugin-ws-config/foo.js @@ -6,4 +6,4 @@ const WebsocketClient = window.expectedClient = WebsocketClient; // eslint-disable-next-line camelcase, no-undef -window.injectedClient = __webpack_dev_server_client__.default; +window.injectedClient = __rspack_dev_server_client__.default; diff --git a/tests/fixtures/reload-config/main.css b/tests/fixtures/reload-config/main.css deleted file mode 100644 index de72503..0000000 --- a/tests/fixtures/reload-config/main.css +++ /dev/null @@ -1,3 +0,0 @@ -body { - background-color: rgb(255, 0, 0); -} diff --git a/tests/fixtures/worker-config-dev-server-false/public/worker-bundle.js b/tests/fixtures/worker-config-dev-server-false/public/worker-bundle.js index 23b405f..41af386 100644 --- a/tests/fixtures/worker-config-dev-server-false/public/worker-bundle.js +++ b/tests/fixtures/worker-config-dev-server-false/public/worker-bundle.js @@ -1,4 +1,15 @@ (() => { + // The require scope + var __webpack_require__ = {}; + + // webpack/runtime/rspack_version + (() => { + __webpack_require__.rv = () => '2.0.0-beta.5'; + })(); + // webpack/runtime/rspack_unique_id + (() => { + __webpack_require__.ruid = 'bundler=rspack@2.0.0-beta.5'; + })(); postMessage("I'm working before postMessage"); onmessage = (event) => { From c58bde909f3a4c7dafd9416ed75c9933c0f6742d Mon Sep 17 00:00:00 2001 From: neverland Date: Fri, 6 Mar 2026 17:40:11 +0800 Subject: [PATCH 2/2] fix --- tests/fixtures/reload-config/main.css | 3 +++ .../public/worker-bundle.js | 11 ----------- 2 files changed, 3 insertions(+), 11 deletions(-) create mode 100644 tests/fixtures/reload-config/main.css diff --git a/tests/fixtures/reload-config/main.css b/tests/fixtures/reload-config/main.css new file mode 100644 index 0000000..de72503 --- /dev/null +++ b/tests/fixtures/reload-config/main.css @@ -0,0 +1,3 @@ +body { + background-color: rgb(255, 0, 0); +} diff --git a/tests/fixtures/worker-config-dev-server-false/public/worker-bundle.js b/tests/fixtures/worker-config-dev-server-false/public/worker-bundle.js index 41af386..23b405f 100644 --- a/tests/fixtures/worker-config-dev-server-false/public/worker-bundle.js +++ b/tests/fixtures/worker-config-dev-server-false/public/worker-bundle.js @@ -1,15 +1,4 @@ (() => { - // The require scope - var __webpack_require__ = {}; - - // webpack/runtime/rspack_version - (() => { - __webpack_require__.rv = () => '2.0.0-beta.5'; - })(); - // webpack/runtime/rspack_unique_id - (() => { - __webpack_require__.ruid = 'bundler=rspack@2.0.0-beta.5'; - })(); postMessage("I'm working before postMessage"); onmessage = (event) => {