From d56058e3635359008b2b269fc16d6e30a9cbfa36 Mon Sep 17 00:00:00 2001 From: neverland Date: Sat, 28 Feb 2026 11:36:01 +0800 Subject: [PATCH 1/2] refactor: rename webpack-dev-server to rspack-dev-server --- client-src/index.ts | 4 +- client-src/overlay.ts | 8 +- src/server.ts | 12 +- src/servers/SockJSServer.ts | 2 +- .../overlay.test.js.snap.webpack5 | 96 ++++++++-------- tests/e2e/built-in-routes.test.js | 6 +- tests/e2e/hot-and-live-reload.test.js | 17 ++- tests/e2e/overlay.test.js | 106 +++++++++--------- 8 files changed, 125 insertions(+), 126 deletions(-) diff --git a/client-src/index.ts b/client-src/index.ts index e6b490a..dc847e6 100644 --- a/client-src/index.ts +++ b/client-src/index.ts @@ -269,9 +269,9 @@ const reloadApp = ( } const search = self.location.search.toLowerCase(); - const allowToHot = search.indexOf('webpack-dev-server-hot=false') === -1; + const allowToHot = search.indexOf('rspack-dev-server-hot=false') === -1; const allowToLiveReload = - search.indexOf('webpack-dev-server-live-reload=false') === -1; + search.indexOf('rspack-dev-server-live-reload=false') === -1; if (hot && allowToHot) { log.info('App hot update...'); diff --git a/client-src/overlay.ts b/client-src/overlay.ts index 71cadf3..2eb3f3e 100644 --- a/client-src/overlay.ts +++ b/client-src/overlay.ts @@ -460,7 +460,7 @@ const createOverlay = (options: CreateOverlayOptions): StateMachine => { // Enable Trusted Types if they are available in the current browser. if (window.trustedTypes) { overlayTrustedTypesPolicy = window.trustedTypes.createPolicy( - trustedTypesPolicyName || 'webpack-dev-server#overlay', + trustedTypesPolicyName || 'rspack-dev-server#overlay', { createHTML: (value: string) => value, }, @@ -468,7 +468,7 @@ const createOverlay = (options: CreateOverlayOptions): StateMachine => { } iframeContainerElement = document.createElement('iframe'); - iframeContainerElement.id = 'webpack-dev-server-client-overlay'; + iframeContainerElement.id = 'rspack-dev-server-client-overlay'; iframeContainerElement.src = 'about:blank'; applyStyle(iframeContainerElement, iframeStyle); @@ -480,7 +480,7 @@ const createOverlay = (options: CreateOverlayOptions): StateMachine => { iframeContainerElement?.contentDocument as Document ).createElement('div'); - contentElement.id = 'webpack-dev-server-client-overlay-div'; + contentElement.id = 'rspack-dev-server-client-overlay-div'; applyStyle(contentElement, containerStyle); headerElement = document.createElement('div'); @@ -590,7 +590,7 @@ const createOverlay = (options: CreateOverlayOptions): StateMachine => { typeElement.setAttribute('data-can-open', 'true'); typeElement.addEventListener('click', () => { fetch( - `/webpack-dev-server/open-editor?fileName=${message.moduleIdentifier}`, + `/rspack-dev-server/open-editor?fileName=${message.moduleIdentifier}`, ); }); } diff --git a/src/server.ts b/src/server.ts index 78e2598..bc09ada 100644 --- a/src/server.ts +++ b/src/server.ts @@ -1775,8 +1775,8 @@ class Server< // Should be after `webpack-dev-middleware`, otherwise other middlewares might rewrite response middlewares.push({ - name: 'webpack-dev-server-sockjs-bundle', - path: '/__webpack_dev_server__/sockjs.bundle.js', + name: 'rspack-dev-server-sockjs-bundle', + path: '/__rspack_dev_server__/sockjs.bundle.js', middleware: (req: Request, res: Response, next: NextFunction) => { if (req.method !== 'GET' && req.method !== 'HEAD') { next(); @@ -1818,8 +1818,8 @@ class Server< }); middlewares.push({ - name: 'webpack-dev-server-invalidate', - path: '/webpack-dev-server/invalidate', + name: 'rspack-dev-server-invalidate', + path: '/rspack-dev-server/invalidate', middleware: (req: Request, res: Response, next: NextFunction) => { if (req.method !== 'GET' && req.method !== 'HEAD') { next(); @@ -1833,8 +1833,8 @@ class Server< }); middlewares.push({ - name: 'webpack-dev-server-open-editor', - path: '/webpack-dev-server/open-editor', + name: 'rspack-dev-server-open-editor', + path: '/rspack-dev-server/open-editor', middleware: (req: Request, res: Response, next: NextFunction) => { if (req.method !== 'GET' && req.method !== 'HEAD') { next(); diff --git a/src/servers/SockJSServer.ts b/src/servers/SockJSServer.ts index a31c8b2..d983313 100644 --- a/src/servers/SockJSServer.ts +++ b/src/servers/SockJSServer.ts @@ -61,7 +61,7 @@ class SockJSServer extends BaseServer { return options.sockjsUrl; } - return '/__webpack_dev_server__/sockjs.bundle.js'; + return '/__rspack_dev_server__/sockjs.bundle.js'; }; this.implementation = sockjs.createServer({ diff --git a/tests/e2e/__snapshots__/overlay.test.js.snap.webpack5 b/tests/e2e/__snapshots__/overlay.test.js.snap.webpack5 index 81ca2b5..0b1ef9a 100644 --- a/tests/e2e/__snapshots__/overlay.test.js.snap.webpack5 +++ b/tests/e2e/__snapshots__/overlay.test.js.snap.webpack5 @@ -35,7 +35,7 @@ exports[`overlay > should not show an error when "client.overlay.errors" is "fal exports[`overlay > should not show initially, then show on an error and allow to close > overlay html 1`] = `