From ffa60b67067f0e3bd6d894ba1a48bb6b17b30497 Mon Sep 17 00:00:00 2001 From: neverland Date: Tue, 3 Mar 2026 14:42:32 +0800 Subject: [PATCH] feat!: rename webpack env vars to rspack --- src/server.ts | 8 ++++---- tests/e2e/api.test.js | 20 ++++++++++---------- tests/e2e/host.test.js | 4 ++-- tests/e2e/port.test.js | 6 +++--- tests/e2e/web-socket-server-url.test.js | 8 ++++---- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/server.ts b/src/server.ts index 350939d..8784fb4 100644 --- a/src/server.ts +++ b/src/server.ts @@ -318,15 +318,15 @@ class Server< const { default: pRetry } = await import('p-retry'); const getPort = require('./getPort'); const basePort = - typeof process.env.WEBPACK_DEV_SERVER_BASE_PORT !== 'undefined' - ? Number.parseInt(process.env.WEBPACK_DEV_SERVER_BASE_PORT, 10) + typeof process.env.RSPACK_DEV_SERVER_BASE_PORT !== 'undefined' + ? Number.parseInt(process.env.RSPACK_DEV_SERVER_BASE_PORT, 10) : 8080; // Try to find unused port and listen on it for 3 times, // if port is not specified in options. const defaultPortRetry = - typeof process.env.WEBPACK_DEV_SERVER_PORT_RETRY !== 'undefined' - ? Number.parseInt(process.env.WEBPACK_DEV_SERVER_PORT_RETRY, 10) + typeof process.env.RSPACK_DEV_SERVER_PORT_RETRY !== 'undefined' + ? Number.parseInt(process.env.RSPACK_DEV_SERVER_PORT_RETRY, 10) : 3; return pRetry(() => getPort(basePort, host), { diff --git a/tests/e2e/api.test.js b/tests/e2e/api.test.js index 54cdc3e..0f2dd53 100644 --- a/tests/e2e/api.test.js +++ b/tests/e2e/api.test.js @@ -350,8 +350,8 @@ describe('API', () => { let devServerPort; afterEach(() => { - process.env.WEBPACK_DEV_SERVER_BASE_PORT = undefined; - process.env.WEBPACK_DEV_SERVER_PORT_RETRY = undefined; + process.env.RSPACK_DEV_SERVER_BASE_PORT = undefined; + process.env.RSPACK_DEV_SERVER_PORT_RETRY = undefined; return dummyServers .reduce( @@ -372,7 +372,7 @@ describe('API', () => { }); function createDummyServers(n) { - process.env.WEBPACK_DEV_SERVER_BASE_PORT = 60000; + process.env.RSPACK_DEV_SERVER_BASE_PORT = 60000; return (Array.isArray(n) ? n : [...new Array(n)]).reduce( (p, _, i) => @@ -400,7 +400,7 @@ describe('API', () => { it('should return the port when the port is specified', async () => { const retryCount = 1; - process.env.WEBPACK_DEV_SERVER_PORT_RETRY = retryCount; + process.env.RSPACK_DEV_SERVER_PORT_RETRY = retryCount; const freePort = await Server.getFreePort(9082); @@ -410,7 +410,7 @@ describe('API', () => { it('should return the port when the port is `null`', async () => { const retryCount = 2; - process.env.WEBPACK_DEV_SERVER_PORT_RETRY = retryCount; + process.env.RSPACK_DEV_SERVER_PORT_RETRY = retryCount; await createDummyServers(retryCount); @@ -449,7 +449,7 @@ describe('API', () => { it('should return the port when the port is undefined', async () => { const retryCount = 3; - process.env.WEBPACK_DEV_SERVER_PORT_RETRY = retryCount; + process.env.RSPACK_DEV_SERVER_PORT_RETRY = retryCount; await createDummyServers(retryCount); @@ -489,7 +489,7 @@ describe('API', () => { it('should retry finding the port for up to defaultPortRetry times (number)', async () => { const retryCount = 4; - process.env.WEBPACK_DEV_SERVER_PORT_RETRY = retryCount; + process.env.RSPACK_DEV_SERVER_PORT_RETRY = retryCount; await createDummyServers(retryCount); @@ -528,7 +528,7 @@ describe('API', () => { it('should retry finding the port for up to defaultPortRetry times (string)', async () => { const retryCount = 5; - process.env.WEBPACK_DEV_SERVER_PORT_RETRY = retryCount; + process.env.RSPACK_DEV_SERVER_PORT_RETRY = retryCount; await createDummyServers(retryCount); @@ -567,7 +567,7 @@ describe('API', () => { it('should retry finding the port when serial ports are busy', async () => { const busyPorts = [60000, 60001, 60002, 60003, 60004, 60005]; - process.env.WEBPACK_DEV_SERVER_PORT_RETRY = 1000; + process.env.RSPACK_DEV_SERVER_PORT_RETRY = 1000; await createDummyServers(busyPorts); @@ -611,7 +611,7 @@ describe('API', () => { () => () => Promise.reject(new Error('busy')), ); - process.env.WEBPACK_DEV_SERVER_PORT_RETRY = 1; + process.env.RSPACK_DEV_SERVER_PORT_RETRY = 1; const { RspackDevServer: Server } = require('@rspack/dev-server'); diff --git a/tests/e2e/host.test.js b/tests/e2e/host.test.js index a145462..603305a 100644 --- a/tests/e2e/host.test.js +++ b/tests/e2e/host.test.js @@ -200,7 +200,7 @@ describe('host', () => { it(`should work using "${host}" host and "auto" port`, async () => { const compiler = rspack(config); - process.env.WEBPACK_DEV_SERVER_BASE_PORT = port; + process.env.RSPACK_DEV_SERVER_BASE_PORT = port; const devServerOptions = { port: 'auto' }; @@ -260,7 +260,7 @@ describe('host', () => { expect(pageErrors).toMatchSnapshot('page errors'); } finally { - process.env.WEBPACK_DEV_SERVER_BASE_PORT = undefined; + process.env.RSPACK_DEV_SERVER_BASE_PORT = undefined; await browser.close(); await server.stop(); diff --git a/tests/e2e/port.test.js b/tests/e2e/port.test.js index 33b68bc..c6fe3f2 100644 --- a/tests/e2e/port.test.js +++ b/tests/e2e/port.test.js @@ -28,10 +28,10 @@ describe('port', () => { testedPort === '' || typeof testedPort === 'undefined' ) { - process.env.WEBPACK_DEV_SERVER_BASE_PORT = port; + process.env.RSPACK_DEV_SERVER_BASE_PORT = port; usedPort = port; } else if (testedPort === 'auto') { - process.env.WEBPACK_DEV_SERVER_BASE_PORT = port; + process.env.RSPACK_DEV_SERVER_BASE_PORT = port; devServerOptions.port = testedPort; usedPort = port; } else { @@ -100,7 +100,7 @@ describe('port', () => { testedPort === '' || typeof testedPort === 'undefined' ) { - process.env.WEBPACK_DEV_SERVER_BASE_PORT = undefined; + process.env.RSPACK_DEV_SERVER_BASE_PORT = undefined; } }); } diff --git a/tests/e2e/web-socket-server-url.test.js b/tests/e2e/web-socket-server-url.test.js index b0fca7d..3736362 100644 --- a/tests/e2e/web-socket-server-url.test.js +++ b/tests/e2e/web-socket-server-url.test.js @@ -306,7 +306,7 @@ describe('web socket server URL', () => { }); it(`should work behind proxy, when the "host" option is "local-ip" and the "port" option is "auto" ("${webSocketServer}")`, async () => { - process.env.WEBPACK_DEV_SERVER_BASE_PORT = 40000; + process.env.RSPACK_DEV_SERVER_BASE_PORT = 40000; const proxyHost = Server.internalIPSync('v4'); const proxyPort = port2; @@ -404,7 +404,7 @@ describe('web socket server URL', () => { await browser.close(); await server.stop(); - process.env.WEBPACK_DEV_SERVER_BASE_PORT = undefined; + process.env.RSPACK_DEV_SERVER_BASE_PORT = undefined; } }); @@ -2361,7 +2361,7 @@ describe('web socket server URL', () => { }); it(`should work when "port" option is "auto" ("${webSocketServer}")`, async () => { - process.env.WEBPACK_DEV_SERVER_BASE_PORT = 50000; + process.env.RSPACK_DEV_SERVER_BASE_PORT = 50000; const compiler = rspack(config); const devServerOptions = { @@ -2430,7 +2430,7 @@ describe('web socket server URL', () => { await browser.close(); await server.stop(); - process.env.WEBPACK_DEV_SERVER_BASE_PORT = undefined; + process.env.RSPACK_DEV_SERVER_BASE_PORT = undefined; } });