diff --git a/tests/e2e/allowed-hosts.test.js b/tests/e2e/allowed-hosts.test.js index 5c3fb44..52bb745 100644 --- a/tests/e2e/allowed-hosts.test.js +++ b/tests/e2e/allowed-hosts.test.js @@ -2,7 +2,7 @@ const express = require('express'); const { rspack } = require('@rspack/core'); const { createProxyMiddleware } = require('http-proxy-middleware'); const { RspackDevServer: Server } = require('@rspack/dev-server'); -const config = require('../fixtures/client-config/webpack.config'); +const config = require('../fixtures/client-config/rspack.config'); const runBrowser = require('../helpers/run-browser'); const [port1, port2] = require('../helpers/ports-map')['allowed-hosts']; diff --git a/tests/e2e/api.test.js b/tests/e2e/api.test.js index cfb95cc..87d05eb 100644 --- a/tests/e2e/api.test.js +++ b/tests/e2e/api.test.js @@ -1,7 +1,7 @@ const path = require('node:path'); const { rspack } = require('@rspack/core'); const { RspackDevServer: Server } = require('@rspack/dev-server'); -const config = require('../fixtures/client-config/webpack.config'); +const config = require('../fixtures/client-config/rspack.config'); const runBrowser = require('../helpers/run-browser'); const sessionSubscribe = require('../helpers/session-subscribe'); const port = require('../helpers/ports-map').api; diff --git a/tests/e2e/app.test.js b/tests/e2e/app.test.js index 14a5dd7..282e430 100644 --- a/tests/e2e/app.test.js +++ b/tests/e2e/app.test.js @@ -3,7 +3,7 @@ const path = require('node:path'); const { rspack } = require('@rspack/core'); const wdm = require('webpack-dev-middleware'); const { RspackDevServer: Server } = require('@rspack/dev-server'); -const config = require('../fixtures/client-config/webpack.config'); +const config = require('../fixtures/client-config/rspack.config'); const runBrowser = require('../helpers/run-browser'); const port = require('../helpers/ports-map').app; diff --git a/tests/e2e/built-in-routes.test.js b/tests/e2e/built-in-routes.test.js index c57601c..bd2dbb8 100644 --- a/tests/e2e/built-in-routes.test.js +++ b/tests/e2e/built-in-routes.test.js @@ -1,7 +1,7 @@ const { rspack } = require('@rspack/core'); const { RspackDevServer: Server } = require('@rspack/dev-server'); -const config = require('../fixtures/client-config/webpack.config'); -const multiConfig = require('../fixtures/multi-public-path-config/webpack.config'); +const config = require('../fixtures/client-config/rspack.config'); +const multiConfig = require('../fixtures/multi-public-path-config/rspack.config'); const runBrowser = require('../helpers/run-browser'); const port = require('../helpers/ports-map').routes; diff --git a/tests/e2e/client-reconnect.test.js b/tests/e2e/client-reconnect.test.js index e2138b2..9d58558 100644 --- a/tests/e2e/client-reconnect.test.js +++ b/tests/e2e/client-reconnect.test.js @@ -1,6 +1,6 @@ const { rspack } = require('@rspack/core'); const { RspackDevServer: Server } = require('@rspack/dev-server'); -const config = require('../fixtures/simple-config/webpack.config'); +const config = require('../fixtures/simple-config/rspack.config'); const runBrowser = require('../helpers/run-browser'); const port = require('../helpers/ports-map')['client-reconnect-option']; diff --git a/tests/e2e/client.test.js b/tests/e2e/client.test.js index 4ca9244..47c44a6 100644 --- a/tests/e2e/client.test.js +++ b/tests/e2e/client.test.js @@ -1,6 +1,6 @@ const { rspack } = require('@rspack/core'); const { RspackDevServer: Server } = require('@rspack/dev-server'); -const config = require('../fixtures/simple-config-other/webpack.config'); +const config = require('../fixtures/simple-config-other/rspack.config'); const runBrowser = require('../helpers/run-browser'); const port = require('../helpers/ports-map')['client-option']; diff --git a/tests/e2e/compress.test.js b/tests/e2e/compress.test.js index 2365f26..7c009fb 100644 --- a/tests/e2e/compress.test.js +++ b/tests/e2e/compress.test.js @@ -1,6 +1,6 @@ const { rspack } = require('@rspack/core'); const { RspackDevServer: Server } = require('@rspack/dev-server'); -const config = require('../fixtures/simple-config-other/webpack.config'); +const config = require('../fixtures/simple-config-other/rspack.config'); const runBrowser = require('../helpers/run-browser'); const port = require('../helpers/ports-map')['compress-option']; diff --git a/tests/e2e/entry.test.js b/tests/e2e/entry.test.js index 4406932..43e78a2 100644 --- a/tests/e2e/entry.test.js +++ b/tests/e2e/entry.test.js @@ -1,7 +1,7 @@ const path = require('node:path'); const { rspack } = require('@rspack/core'); const { RspackDevServer: Server } = require('@rspack/dev-server'); -const config = require('../fixtures/client-config/webpack.config'); +const config = require('../fixtures/client-config/rspack.config'); const runBrowser = require('../helpers/run-browser'); const port = require('../helpers/ports-map').entry; diff --git a/tests/e2e/headers.test.js b/tests/e2e/headers.test.js index e2a3a46..e86065c 100644 --- a/tests/e2e/headers.test.js +++ b/tests/e2e/headers.test.js @@ -1,6 +1,6 @@ const { rspack } = require('@rspack/core'); const { RspackDevServer: Server } = require('@rspack/dev-server'); -const config = require('../fixtures/simple-config/webpack.config'); +const config = require('../fixtures/simple-config/rspack.config'); const runBrowser = require('../helpers/run-browser'); const request = require('../helpers/http-request'); const port = require('../helpers/ports-map')['headers-option']; diff --git a/tests/e2e/history-api-fallback.test.js b/tests/e2e/history-api-fallback.test.js index da88af1..eb6d510 100644 --- a/tests/e2e/history-api-fallback.test.js +++ b/tests/e2e/history-api-fallback.test.js @@ -1,9 +1,9 @@ const path = require('node:path'); const { rspack } = require('@rspack/core'); const { RspackDevServer: Server } = require('@rspack/dev-server'); -const config = require('../fixtures/historyapifallback-config/webpack.config'); -const config2 = require('../fixtures/historyapifallback-2-config/webpack.config'); -const config3 = require('../fixtures/historyapifallback-3-config/webpack.config'); +const config = require('../fixtures/historyapifallback-config/rspack.config'); +const config2 = require('../fixtures/historyapifallback-2-config/rspack.config'); +const config3 = require('../fixtures/historyapifallback-3-config/rspack.config'); const runBrowser = require('../helpers/run-browser'); const port = require('../helpers/ports-map')['history-api-fallback-option']; diff --git a/tests/e2e/host.test.js b/tests/e2e/host.test.js index 603305a..0563294 100644 --- a/tests/e2e/host.test.js +++ b/tests/e2e/host.test.js @@ -1,7 +1,7 @@ const http = require('node:http'); const { rspack } = require('@rspack/core'); const { RspackDevServer: Server } = require('@rspack/dev-server'); -const config = require('../fixtures/client-config/webpack.config'); +const config = require('../fixtures/client-config/rspack.config'); const runBrowser = require('../helpers/run-browser'); const port = require('../helpers/ports-map').host; diff --git a/tests/e2e/hot-and-live-reload.test.js b/tests/e2e/hot-and-live-reload.test.js index 28bcb0d..bc54908 100644 --- a/tests/e2e/hot-and-live-reload.test.js +++ b/tests/e2e/hot-and-live-reload.test.js @@ -4,11 +4,11 @@ const { rspack } = require('@rspack/core'); const fs = require('node:fs'); const { RspackDevServer: Server } = require('@rspack/dev-server'); const HTMLGeneratorPlugin = require('../helpers/html-generator-plugin'); -const reloadConfig = require('../fixtures/reload-config/webpack.config'); +const reloadConfig = require('../fixtures/reload-config/rspack.config'); const runBrowser = require('../helpers/run-browser'); const port = require('../helpers/ports-map')['hot-and-live-reload']; -const config = require('../fixtures/client-config/webpack.config'); -const multiCompilerConfig = require('../fixtures/multi-compiler-one-configuration/webpack.config'); +const config = require('../fixtures/client-config/rspack.config'); +const multiCompilerConfig = require('../fixtures/multi-compiler-one-configuration/rspack.config'); require('../helpers/normalize'); const cssFilePath = path.resolve( @@ -155,7 +155,7 @@ describe('hot and live reload', () => { }, { title: 'should work with manual client setup', - webpackOptions: { + rspackOptions: { entry: [ require.resolve('@rspack/dev-server/client/index.js'), require.resolve('../fixtures/reload-config/foo.js'), @@ -171,7 +171,7 @@ describe('hot and live reload', () => { { title: 'should work with manual client setup and allow to enable hot module replacement', - webpackOptions: { + rspackOptions: { entry: [ '@rspack/core/hot/dev-server', `${require.resolve('@rspack/dev-server/client/index.js')}?hot=true`, @@ -191,7 +191,7 @@ describe('hot and live reload', () => { { title: 'should work with manual client setup and allow to disable hot module replacement', - webpackOptions: { + rspackOptions: { entry: [ `${require.resolve('@rspack/dev-server/client/index.js')}?hot=false`, require.resolve('../fixtures/reload-config/foo.js'), @@ -206,7 +206,7 @@ describe('hot and live reload', () => { { title: 'should work with manual client setup and allow to enable live reload', - webpackOptions: { + rspackOptions: { entry: [ `${require.resolve('@rspack/dev-server/client/index.js')}?live-reload=true`, require.resolve('../fixtures/reload-config/foo.js'), @@ -221,7 +221,7 @@ describe('hot and live reload', () => { { title: 'should work with manual client setup and allow to disable live reload', - webpackOptions: { + rspackOptions: { entry: [ `${require.resolve('@rspack/dev-server/client/index.js')}?live-reload=false`, require.resolve('../fixtures/reload-config/foo.js'), @@ -260,8 +260,8 @@ describe('hot and live reload', () => { : 'default'; it(`${mode.title} (${webSocketServerTitle})`, async () => { - const webpackOptions = { ...reloadConfig, ...mode.webpackOptions }; - const compiler = rspack(webpackOptions); + const rspackOptions = { ...reloadConfig, ...mode.rspackOptions }; + const compiler = rspack(rspackOptions); const testDevServerOptions = mode.options || {}; const devServerOptions = { port, ...testDevServerOptions }; @@ -390,25 +390,23 @@ describe('hot and live reload', () => { waitLiveReload = false; } - if (Array.isArray(webpackOptions.entry)) { - if (webpackOptions.entry.some((item) => item.includes('hot=true'))) { + if (Array.isArray(rspackOptions.entry)) { + if (rspackOptions.entry.some((item) => item.includes('hot=true'))) { waitHot = true; } else if ( - webpackOptions.entry.some((item) => item.includes('hot=false')) + rspackOptions.entry.some((item) => item.includes('hot=false')) ) { waitHot = false; } } - if (Array.isArray(webpackOptions.entry)) { + if (Array.isArray(rspackOptions.entry)) { if ( - webpackOptions.entry.some((item) => item.includes('live-reload=true')) + rspackOptions.entry.some((item) => item.includes('live-reload=true')) ) { waitLiveReload = true; } else if ( - webpackOptions.entry.some((item) => - item.includes('live-reload=false'), - ) + rspackOptions.entry.some((item) => item.includes('live-reload=false')) ) { waitLiveReload = false; } diff --git a/tests/e2e/ipc.test.js b/tests/e2e/ipc.test.js index 0fa56f4..4f625d2 100644 --- a/tests/e2e/ipc.test.js +++ b/tests/e2e/ipc.test.js @@ -5,7 +5,7 @@ const http = require('node:http'); const { rspack } = require('@rspack/core'); const httpProxy = require('http-proxy'); const { RspackDevServer: Server } = require('@rspack/dev-server'); -const config = require('../fixtures/client-config/webpack.config'); +const config = require('../fixtures/client-config/rspack.config'); const runBrowser = require('../helpers/run-browser'); const sessionSubscribe = require('../helpers/session-subscribe'); const port1 = require('../helpers/ports-map').ipc; diff --git a/tests/e2e/lazy-compilation.test.js b/tests/e2e/lazy-compilation.test.js index d8e24b0..ced0645 100644 --- a/tests/e2e/lazy-compilation.test.js +++ b/tests/e2e/lazy-compilation.test.js @@ -1,7 +1,7 @@ const { rspack } = require('@rspack/core'); const { RspackDevServer: Server } = require('@rspack/dev-server'); -const lazyCompilationSingleEntryConfig = require('../fixtures/lazy-compilation-single-entry/webpack.config'); -const lazyCompilationMultipleEntriesConfig = require('../fixtures/lazy-compilation-multiple-entries/webpack.config'); +const lazyCompilationSingleEntryConfig = require('../fixtures/lazy-compilation-single-entry/rspack.config'); +const lazyCompilationMultipleEntriesConfig = require('../fixtures/lazy-compilation-multiple-entries/rspack.config'); const runBrowser = require('../helpers/run-browser'); const port = require('../helpers/ports-map')['lazy-compilation']; diff --git a/tests/e2e/logging.test.js b/tests/e2e/logging.test.js index ae37f50..5afeee8 100644 --- a/tests/e2e/logging.test.js +++ b/tests/e2e/logging.test.js @@ -3,7 +3,7 @@ const fs = require('node:fs'); const { rspack } = require('@rspack/core'); const { RspackDevServer: Server } = require('@rspack/dev-server'); const HTMLGeneratorPlugin = require('../helpers/html-generator-plugin'); -const config = require('../fixtures/client-config/webpack.config'); +const config = require('../fixtures/client-config/rspack.config'); const runBrowser = require('../helpers/run-browser'); const port = require('../helpers/ports-map').logging; require('../helpers/normalize'); @@ -56,12 +56,12 @@ describe('logging', () => { }, { title: 'should work and log warnings by default', - webpackOptions: { + rspackOptions: { plugins: [ { apply(compiler) { compiler.hooks.thisCompilation.tap( - 'warnings-webpack-plugin', + 'warnings-rspack-plugin', (compilation) => { compilation.warnings.push( new Error('Warning from compilation'), @@ -76,12 +76,12 @@ describe('logging', () => { }, { title: 'should work and log errors by default', - webpackOptions: { + rspackOptions: { plugins: [ { apply(compiler) { compiler.hooks.thisCompilation.tap( - 'warnings-webpack-plugin', + 'warnings-rspack-plugin', (compilation) => { compilation.errors.push(new Error('Error from compilation')); }, @@ -126,12 +126,12 @@ describe('logging', () => { }, { title: 'should work and log only error', - webpackOptions: { + rspackOptions: { plugins: [ { apply(compiler) { compiler.hooks.thisCompilation.tap( - 'warnings-webpack-plugin', + 'warnings-rspack-plugin', (compilation) => { compilation.warnings.push( new Error('Warning from compilation'), @@ -152,12 +152,12 @@ describe('logging', () => { }, { title: 'should work and log warning and errors', - webpackOptions: { + rspackOptions: { plugins: [ { apply(compiler) { compiler.hooks.thisCompilation.tap( - 'warnings-webpack-plugin', + 'warnings-rspack-plugin', (compilation) => { compilation.warnings.push( new Error('Warning from compilation'), @@ -189,7 +189,7 @@ describe('logging', () => { it(`${testCase.title} (${ webSocketServer.webSocketServer || 'default' })`, async () => { - const compiler = rspack({ ...config, ...testCase.webpackOptions }); + const compiler = rspack({ ...config, ...testCase.rspackOptions }); const devServerOptions = { port, ...testCase.devServerOptions, diff --git a/tests/e2e/mime-types.test.js b/tests/e2e/mime-types.test.js index 178a4c8..372a356 100644 --- a/tests/e2e/mime-types.test.js +++ b/tests/e2e/mime-types.test.js @@ -1,6 +1,6 @@ const { rspack } = require('@rspack/core'); const { RspackDevServer: Server } = require('@rspack/dev-server'); -const config = require('../fixtures/mime-types-config/webpack.config'); +const config = require('../fixtures/mime-types-config/rspack.config'); const runBrowser = require('../helpers/run-browser'); const port = require('../helpers/ports-map')['mime-types-option']; diff --git a/tests/e2e/module-federation.test.js b/tests/e2e/module-federation.test.js index 3af09fc..609d10b 100644 --- a/tests/e2e/module-federation.test.js +++ b/tests/e2e/module-federation.test.js @@ -1,12 +1,12 @@ const requireFromString = require('require-from-string'); const { rspack } = require('@rspack/core'); const { RspackDevServer: Server } = require('@rspack/dev-server'); -const simpleConfig = require('../fixtures/module-federation-config/webpack.config'); -const objectEntryConfig = require('../fixtures/module-federation-config/webpack.object-entry.config'); -const multiConfig = require('../fixtures/module-federation-config/webpack.multi.config'); +const simpleConfig = require('../fixtures/module-federation-config/rspack.config'); +const objectEntryConfig = require('../fixtures/module-federation-config/rspack.object-entry.config'); +const multiConfig = require('../fixtures/module-federation-config/rspack.multi.config'); const runBrowser = require('../helpers/run-browser'); const port = require('../helpers/ports-map')['module-federation']; -const pluginConfig = require('../fixtures/module-federation-config/webpack.plugin'); +const pluginConfig = require('../fixtures/module-federation-config/rspack.plugin'); describe('Module federation', () => { describe('should work with simple multi-entry config', () => { diff --git a/tests/e2e/multi-compiler.test.js b/tests/e2e/multi-compiler.test.js index 19ccdcd..caa8e50 100644 --- a/tests/e2e/multi-compiler.test.js +++ b/tests/e2e/multi-compiler.test.js @@ -2,9 +2,9 @@ const path = require('node:path'); const fs = require('node:fs'); const { rspack } = require('@rspack/core'); const { RspackDevServer: Server } = require('@rspack/dev-server'); -const oneWebTargetConfiguration = require('../fixtures/multi-compiler-one-configuration/webpack.config'); -const twoWebTargetConfiguration = require('../fixtures/multi-compiler-two-configurations/webpack.config'); -const universalConfiguration = require('../fixtures/universal-compiler-config/webpack.config'); +const oneWebTargetConfiguration = require('../fixtures/multi-compiler-one-configuration/rspack.config'); +const twoWebTargetConfiguration = require('../fixtures/multi-compiler-two-configurations/rspack.config'); +const universalConfiguration = require('../fixtures/universal-compiler-config/rspack.config'); const runBrowser = require('../helpers/run-browser'); const port = require('../helpers/ports-map')['multi-compiler']; diff --git a/tests/e2e/on-listening.test.js b/tests/e2e/on-listening.test.js index a59d677..83bdd08 100644 --- a/tests/e2e/on-listening.test.js +++ b/tests/e2e/on-listening.test.js @@ -1,6 +1,6 @@ const { rspack } = require('@rspack/core'); const { RspackDevServer: Server } = require('@rspack/dev-server'); -const config = require('../fixtures/client-config/webpack.config'); +const config = require('../fixtures/client-config/rspack.config'); const runBrowser = require('../helpers/run-browser'); const port = require('../helpers/ports-map')['on-listening-option']; diff --git a/tests/e2e/overlay.test.js b/tests/e2e/overlay.test.js index 2a54ccb..09f51c3 100644 --- a/tests/e2e/overlay.test.js +++ b/tests/e2e/overlay.test.js @@ -1,8 +1,8 @@ const path = require('node:path'); const fs = require('node:fs'); const { rspack } = require('@rspack/core'); -const config = require('../fixtures/overlay-config/webpack.config'); -const trustedTypesConfig = require('../fixtures/overlay-config/trusted-types.webpack.config'); +const config = require('../fixtures/overlay-config/rspack.config'); +const trustedTypesConfig = require('../fixtures/overlay-config/trusted-types.rspack.config'); const getPort = require('../helpers/get-port'); const runBrowser = require('../helpers/run-browser'); const basePort = require('../helpers/ports-map').overlay; @@ -20,7 +20,7 @@ class ErrorPlugin { apply(compiler) { compiler.hooks.thisCompilation.tap( - 'errors-webpack-plugin', + 'errors-rspack-plugin', (compilation) => { if ( typeof this.skipCounter !== 'undefined' && @@ -46,7 +46,7 @@ class WarningPlugin { apply(compiler) { compiler.hooks.thisCompilation.tap( - 'warnings-webpack-plugin', + 'warnings-rspack-plugin', (compilation) => { if ( typeof this.skipCounter !== 'undefined' && @@ -746,9 +746,7 @@ describe('overlay', () => { client: { overlay: { warnings: (error) => { - // error is string in webpack 4 - const message = typeof error === 'string' ? error : error.message; - return !message.includes('My special warning'); + return !error.message.includes('My special warning'); }, }, }, @@ -1080,10 +1078,7 @@ describe('overlay', () => { client: { overlay: { errors: (error) => { - // error is string in webpack 4 - const message = typeof error === 'string' ? error : error.message; - - return !message.includes('My special error'); + return !error.message.includes('My special error'); }, }, }, @@ -1225,7 +1220,7 @@ describe('overlay', () => { port, client: { overlay: { - trustedTypesPolicyName: 'webpack#dev-overlay', + trustedTypesPolicyName: 'rspack#dev-overlay', }, }, }; @@ -1294,7 +1289,7 @@ describe('overlay', () => { ], client: { overlay: { - trustedTypesPolicyName: 'webpack#dev-overlay', + trustedTypesPolicyName: 'rspack#dev-overlay', }, }, }; diff --git a/tests/e2e/port.test.js b/tests/e2e/port.test.js index c6fe3f2..3d522ea 100644 --- a/tests/e2e/port.test.js +++ b/tests/e2e/port.test.js @@ -1,6 +1,6 @@ const { rspack } = require('@rspack/core'); const { RspackDevServer: Server } = require('@rspack/dev-server'); -const config = require('../fixtures/client-config/webpack.config'); +const config = require('../fixtures/client-config/rspack.config'); const runBrowser = require('../helpers/run-browser'); const port = require('../helpers/ports-map').port; diff --git a/tests/e2e/progress.test.js b/tests/e2e/progress.test.js index 0c7c69e..3bda788 100644 --- a/tests/e2e/progress.test.js +++ b/tests/e2e/progress.test.js @@ -2,7 +2,7 @@ const path = require('node:path'); const fs = require('node:fs'); const { rspack } = require('@rspack/core'); const { RspackDevServer: Server } = require('@rspack/dev-server'); -const reloadConfig = require('../fixtures/reload-config-2/webpack.config'); +const reloadConfig = require('../fixtures/reload-config-2/rspack.config'); const runBrowser = require('../helpers/run-browser'); const port = require('../helpers/ports-map').progress; diff --git a/tests/e2e/range-header.test.js b/tests/e2e/range-header.test.js index b18b393..d939500 100644 --- a/tests/e2e/range-header.test.js +++ b/tests/e2e/range-header.test.js @@ -1,6 +1,6 @@ const { rspack } = require('@rspack/core'); const { RspackDevServer: Server } = require('@rspack/dev-server'); -const config = require('../fixtures/static-config/webpack.config'); +const config = require('../fixtures/static-config/rspack.config'); const request = require('../helpers/http-request'); const port = require('../helpers/ports-map')['range-header']; const JAVASCRIPT_CONTENT_TYPE_RE = diff --git a/tests/e2e/server-and-client-transport.test.js b/tests/e2e/server-and-client-transport.test.js index c6e3849..474f5bb 100644 --- a/tests/e2e/server-and-client-transport.test.js +++ b/tests/e2e/server-and-client-transport.test.js @@ -1,8 +1,8 @@ const { rspack } = require('@rspack/core'); const { RspackDevServer: Server } = require('@rspack/dev-server'); const WebsocketServer = require('../../src/servers/WebsocketServer').default; -const defaultConfig = require('../fixtures/provide-plugin-default/webpack.config'); -const wsConfig = require('../fixtures/provide-plugin-ws-config/webpack.config'); +const defaultConfig = require('../fixtures/provide-plugin-default/rspack.config'); +const wsConfig = require('../fixtures/provide-plugin-ws-config/rspack.config'); const getPort = require('../helpers/get-port'); const runBrowser = require('../helpers/run-browser'); const basePort = require('../helpers/ports-map')['server-and-client-transport']; diff --git a/tests/e2e/server.test.js b/tests/e2e/server.test.js index b756db9..275e012 100644 --- a/tests/e2e/server.test.js +++ b/tests/e2e/server.test.js @@ -3,7 +3,7 @@ const path = require('node:path'); const fs = require('node:fs'); const { rspack } = require('@rspack/core'); const { RspackDevServer: Server } = require('@rspack/dev-server'); -const config = require('../fixtures/static-config/webpack.config'); +const config = require('../fixtures/static-config/rspack.config'); const runBrowser = require('../helpers/run-browser'); const { skipTestOnWindows } = require('../helpers/conditional-test'); const customHTTP = require('../helpers/custom-http'); diff --git a/tests/e2e/setup-exit-signals.test.js b/tests/e2e/setup-exit-signals.test.js index 6a8177b..d5fb0d3 100644 --- a/tests/e2e/setup-exit-signals.test.js +++ b/tests/e2e/setup-exit-signals.test.js @@ -1,6 +1,6 @@ const { rspack } = require('@rspack/core'); const { RspackDevServer: Server } = require('@rspack/dev-server'); -const config = require('../fixtures/simple-config/webpack.config'); +const config = require('../fixtures/simple-config/rspack.config'); const runBrowser = require('../helpers/run-browser'); const port = require('../helpers/ports-map')['setup-exit-signals-option']; diff --git a/tests/e2e/setup-middlewares.test.js b/tests/e2e/setup-middlewares.test.js index 1e87084..c899a2e 100644 --- a/tests/e2e/setup-middlewares.test.js +++ b/tests/e2e/setup-middlewares.test.js @@ -1,6 +1,6 @@ const { rspack } = require('@rspack/core'); const { RspackDevServer: Server } = require('@rspack/dev-server'); -const config = require('../fixtures/client-config/webpack.config'); +const config = require('../fixtures/client-config/rspack.config'); const runBrowser = require('../helpers/run-browser'); const port = require('../helpers/ports-map')['setup-middlewares-option']; @@ -18,7 +18,7 @@ describe('setupMiddlewares option', () => { { setupMiddlewares: (middlewares, devServer) => { if (!devServer) { - throw new Error('webpack-dev-server is not defined'); + throw new Error('rspack-dev-server is not defined'); } devServer.app.use('/setup-middleware/some/path', (req, res, next) => { diff --git a/tests/e2e/static-directory.test.js b/tests/e2e/static-directory.test.js index 212002c..1583d7f 100644 --- a/tests/e2e/static-directory.test.js +++ b/tests/e2e/static-directory.test.js @@ -3,7 +3,7 @@ const fs = require('node:fs'); const { rspack } = require('@rspack/core'); const { RspackDevServer: Server } = require('@rspack/dev-server'); const testServer = require('../helpers/test-server'); -const config = require('../fixtures/static-config/webpack.config'); +const config = require('../fixtures/static-config/rspack.config'); const port = require('../helpers/ports-map')['static-directory-option']; const runBrowser = require('../helpers/run-browser'); diff --git a/tests/e2e/static-public-path.test.js b/tests/e2e/static-public-path.test.js index d1e80f2..422912f 100644 --- a/tests/e2e/static-public-path.test.js +++ b/tests/e2e/static-public-path.test.js @@ -1,7 +1,7 @@ const path = require('node:path'); const { rspack } = require('@rspack/core'); const { RspackDevServer: Server } = require('@rspack/dev-server'); -const config = require('../fixtures/static-config/webpack.config'); +const config = require('../fixtures/static-config/rspack.config'); const port = require('../helpers/ports-map')['static-public-path-option']; const runBrowser = require('../helpers/run-browser'); diff --git a/tests/e2e/stats.test.js b/tests/e2e/stats.test.js index 52c984c..c59ce45 100644 --- a/tests/e2e/stats.test.js +++ b/tests/e2e/stats.test.js @@ -1,6 +1,6 @@ const { rspack } = require('@rspack/core'); const { RspackDevServer: Server } = require('@rspack/dev-server'); -const config = require('../fixtures/client-config/webpack.config'); +const config = require('../fixtures/client-config/rspack.config'); const HTMLGeneratorPlugin = require('../helpers/html-generator-plugin'); const runBrowser = require('../helpers/run-browser'); const port = require('../helpers/ports-map').stats; @@ -11,37 +11,37 @@ describe('stats', () => { const cases = [ { title: 'should work when "stats" is not specified', - webpackOptions: {}, + rspackOptions: {}, }, { title: 'should work using "{}" value for the "stats" option', - webpackOptions: { + rspackOptions: { stats: {}, }, }, { title: 'should work using "undefined" value for the "stats" option', - webpackOptions: { + rspackOptions: { // eslint-disable-next-line no-undefined stats: undefined, }, }, { title: 'should work using "false" value for the "stats" option', - webpackOptions: { + rspackOptions: { stats: false, }, }, { title: 'should work using "errors-only" value for the "stats" option', - webpackOptions: { + rspackOptions: { stats: 'errors-only', }, }, { title: 'should work using "{ assets: false }" value for the "stats" option', - webpackOptions: { + rspackOptions: { stats: { assets: false, }, @@ -51,7 +51,7 @@ describe('stats', () => { // { // title: // 'should work using "{ assets: false }" value for the "stats" option', - // webpackOptions: { + // rspackOptions: { // stats: { // colors: { // green: "\u001b[32m", @@ -63,12 +63,12 @@ describe('stats', () => { // { // title: // 'should work using "{ warningsFilter: \'test\' }" value for the "stats" option', - // webpackOptions: { + // rspackOptions: { // plugins: [ // { // apply(compiler) { // compiler.hooks.thisCompilation.tap( - // "warnings-webpack-plugin", + // "warnings-rspack-plugin", // (compilation) => { // compilation.warnings.push( // new Error("Warning from compilation"), @@ -87,12 +87,12 @@ describe('stats', () => { if (rspack.version.startsWith('5')) { cases.push({ title: 'should work and respect the "ignoreWarnings" option', - webpackOptions: { + rspackOptions: { plugins: [ { apply(compiler) { compiler.hooks.thisCompilation.tap( - 'warnings-webpack-plugin', + 'warnings-rspack-plugin', (compilation) => { compilation.warnings.push( new Error('Warning from compilation'), @@ -110,7 +110,7 @@ describe('stats', () => { for (const testCase of cases) { it(testCase.title, async () => { - const compiler = rspack({ ...config, ...testCase.webpackOptions }); + const compiler = rspack({ ...config, ...testCase.rspackOptions }); const devServerOptions = { port, }; diff --git a/tests/e2e/target.test.js b/tests/e2e/target.test.js index 0d242d5..929f53d 100644 --- a/tests/e2e/target.test.js +++ b/tests/e2e/target.test.js @@ -1,11 +1,11 @@ const path = require('node:path'); const { rspack } = require('@rspack/core'); const { RspackDevServer: Server } = require('@rspack/dev-server'); -const config = require('../fixtures/client-config/webpack.config'); +const config = require('../fixtures/client-config/rspack.config'); const runBrowser = require('../helpers/run-browser'); const port = require('../helpers/ports-map').target; -const workerConfig = require('../fixtures/worker-config/webpack.config'); -const workerConfigDevServerFalse = require('../fixtures/worker-config-dev-server-false/webpack.config'); +const workerConfig = require('../fixtures/worker-config/rspack.config'); +const workerConfigDevServerFalse = require('../fixtures/worker-config-dev-server-false/rspack.config'); const sortByTerm = (data, term) => data.sort((a, b) => (a.indexOf(term) < b.indexOf(term) ? -1 : 1)); diff --git a/tests/e2e/watch-files.test.js b/tests/e2e/watch-files.test.js index 7fefc44..609b7e1 100644 --- a/tests/e2e/watch-files.test.js +++ b/tests/e2e/watch-files.test.js @@ -3,7 +3,7 @@ const chokidar = require('chokidar'); const fs = require('node:fs'); const { rspack } = require('@rspack/core'); const { RspackDevServer: Server } = require('@rspack/dev-server'); -const config = require('../fixtures/watch-files-config/webpack.config'); +const config = require('../fixtures/watch-files-config/rspack.config'); const runBrowser = require('../helpers/run-browser'); const port = require('../helpers/ports-map')['watch-files-option']; diff --git a/tests/e2e/web-socket-communication.test.js b/tests/e2e/web-socket-communication.test.js index 99aaf2a..91d8839 100644 --- a/tests/e2e/web-socket-communication.test.js +++ b/tests/e2e/web-socket-communication.test.js @@ -2,7 +2,7 @@ const WebSocket = require('ws'); const { rspack } = require('@rspack/core'); const { RspackDevServer: Server } = require('@rspack/dev-server'); const WebsocketServer = require('../../src/servers/WebsocketServer'); -const config = require('../fixtures/client-config/webpack.config'); +const config = require('../fixtures/client-config/rspack.config'); const runBrowser = require('../helpers/run-browser'); const port = require('../helpers/ports-map')['web-socket-communication']; diff --git a/tests/e2e/web-socket-server-url.test.js b/tests/e2e/web-socket-server-url.test.js index 03e6574..4eab834 100644 --- a/tests/e2e/web-socket-server-url.test.js +++ b/tests/e2e/web-socket-server-url.test.js @@ -2,7 +2,7 @@ const express = require('express'); const { rspack } = require('@rspack/core'); const { createProxyMiddleware } = require('http-proxy-middleware'); const { RspackDevServer: Server } = require('@rspack/dev-server'); -const config = require('../fixtures/client-config/webpack.config'); +const config = require('../fixtures/client-config/rspack.config'); const runBrowser = require('../helpers/run-browser'); const sessionSubscribe = require('../helpers/session-subscribe'); const [port1, port2] = require('../helpers/ports-map')['web-socket-server-url']; diff --git a/tests/e2e/web-socket-server.test.js b/tests/e2e/web-socket-server.test.js index b33ce7a..8f083d9 100644 --- a/tests/e2e/web-socket-server.test.js +++ b/tests/e2e/web-socket-server.test.js @@ -1,6 +1,6 @@ const { rspack } = require('@rspack/core'); const { RspackDevServer: Server } = require('@rspack/dev-server'); -const config = require('../fixtures/client-config/webpack.config'); +const config = require('../fixtures/client-config/rspack.config'); const runBrowser = require('../helpers/run-browser'); const sessionSubscribe = require('../helpers/session-subscribe'); const port = require('../helpers/ports-map')['web-socket-server-test']; diff --git a/tests/fixtures/client-config/webpack.config.js b/tests/fixtures/client-config/rspack.config.js similarity index 100% rename from tests/fixtures/client-config/webpack.config.js rename to tests/fixtures/client-config/rspack.config.js diff --git a/tests/fixtures/historyapifallback-2-config/webpack.config.js b/tests/fixtures/historyapifallback-2-config/rspack.config.js similarity index 100% rename from tests/fixtures/historyapifallback-2-config/webpack.config.js rename to tests/fixtures/historyapifallback-2-config/rspack.config.js diff --git a/tests/fixtures/historyapifallback-3-config/webpack.config.js b/tests/fixtures/historyapifallback-3-config/rspack.config.js similarity index 100% rename from tests/fixtures/historyapifallback-3-config/webpack.config.js rename to tests/fixtures/historyapifallback-3-config/rspack.config.js diff --git a/tests/fixtures/historyapifallback-config/webpack.config.js b/tests/fixtures/historyapifallback-config/rspack.config.js similarity index 100% rename from tests/fixtures/historyapifallback-config/webpack.config.js rename to tests/fixtures/historyapifallback-config/rspack.config.js diff --git a/tests/fixtures/lazy-compilation-multiple-entries/webpack.config.js b/tests/fixtures/lazy-compilation-multiple-entries/rspack.config.js similarity index 100% rename from tests/fixtures/lazy-compilation-multiple-entries/webpack.config.js rename to tests/fixtures/lazy-compilation-multiple-entries/rspack.config.js diff --git a/tests/fixtures/lazy-compilation-single-entry/webpack.config.js b/tests/fixtures/lazy-compilation-single-entry/rspack.config.js similarity index 100% rename from tests/fixtures/lazy-compilation-single-entry/webpack.config.js rename to tests/fixtures/lazy-compilation-single-entry/rspack.config.js diff --git a/tests/fixtures/mime-types-config/webpack.config.js b/tests/fixtures/mime-types-config/rspack.config.js similarity index 100% rename from tests/fixtures/mime-types-config/webpack.config.js rename to tests/fixtures/mime-types-config/rspack.config.js diff --git a/tests/fixtures/module-federation-config/webpack.config.js b/tests/fixtures/module-federation-config/rspack.config.js similarity index 100% rename from tests/fixtures/module-federation-config/webpack.config.js rename to tests/fixtures/module-federation-config/rspack.config.js diff --git a/tests/fixtures/module-federation-config/webpack.multi.config.js b/tests/fixtures/module-federation-config/rspack.multi.config.js similarity index 100% rename from tests/fixtures/module-federation-config/webpack.multi.config.js rename to tests/fixtures/module-federation-config/rspack.multi.config.js diff --git a/tests/fixtures/module-federation-config/webpack.object-entry.config.js b/tests/fixtures/module-federation-config/rspack.object-entry.config.js similarity index 100% rename from tests/fixtures/module-federation-config/webpack.object-entry.config.js rename to tests/fixtures/module-federation-config/rspack.object-entry.config.js diff --git a/tests/fixtures/module-federation-config/webpack.plugin.js b/tests/fixtures/module-federation-config/rspack.plugin.js similarity index 100% rename from tests/fixtures/module-federation-config/webpack.plugin.js rename to tests/fixtures/module-federation-config/rspack.plugin.js diff --git a/tests/fixtures/multi-compiler-one-configuration/webpack.config.js b/tests/fixtures/multi-compiler-one-configuration/rspack.config.js similarity index 100% rename from tests/fixtures/multi-compiler-one-configuration/webpack.config.js rename to tests/fixtures/multi-compiler-one-configuration/rspack.config.js diff --git a/tests/fixtures/multi-compiler-two-configurations/webpack.config.js b/tests/fixtures/multi-compiler-two-configurations/rspack.config.js similarity index 100% rename from tests/fixtures/multi-compiler-two-configurations/webpack.config.js rename to tests/fixtures/multi-compiler-two-configurations/rspack.config.js diff --git a/tests/fixtures/multi-public-path-config/webpack.config.js b/tests/fixtures/multi-public-path-config/rspack.config.js similarity index 100% rename from tests/fixtures/multi-public-path-config/webpack.config.js rename to tests/fixtures/multi-public-path-config/rspack.config.js diff --git a/tests/fixtures/overlay-config/webpack.config.js b/tests/fixtures/overlay-config/rspack.config.js similarity index 100% rename from tests/fixtures/overlay-config/webpack.config.js rename to tests/fixtures/overlay-config/rspack.config.js diff --git a/tests/fixtures/overlay-config/trusted-types.webpack.config.js b/tests/fixtures/overlay-config/trusted-types.rspack.config.js similarity index 89% rename from tests/fixtures/overlay-config/trusted-types.webpack.config.js rename to tests/fixtures/overlay-config/trusted-types.rspack.config.js index ace51bc..1247b06 100644 --- a/tests/fixtures/overlay-config/trusted-types.webpack.config.js +++ b/tests/fixtures/overlay-config/trusted-types.rspack.config.js @@ -9,7 +9,7 @@ module.exports = { entry: './foo.js', output: { path: '/', - trustedTypes: { policyName: 'webpack' }, + trustedTypes: { policyName: 'rspack' }, }, infrastructureLogging: { level: 'info', diff --git a/tests/fixtures/provide-plugin-default/webpack.config.js b/tests/fixtures/provide-plugin-default/rspack.config.js similarity index 100% rename from tests/fixtures/provide-plugin-default/webpack.config.js rename to tests/fixtures/provide-plugin-default/rspack.config.js diff --git a/tests/fixtures/provide-plugin-ws-config/webpack.config.js b/tests/fixtures/provide-plugin-ws-config/rspack.config.js similarity index 100% rename from tests/fixtures/provide-plugin-ws-config/webpack.config.js rename to tests/fixtures/provide-plugin-ws-config/rspack.config.js diff --git a/tests/fixtures/reload-config-2/webpack.config.js b/tests/fixtures/reload-config-2/rspack.config.js similarity index 100% rename from tests/fixtures/reload-config-2/webpack.config.js rename to tests/fixtures/reload-config-2/rspack.config.js diff --git a/tests/fixtures/reload-config/webpack.config.js b/tests/fixtures/reload-config/rspack.config.js similarity index 100% rename from tests/fixtures/reload-config/webpack.config.js rename to tests/fixtures/reload-config/rspack.config.js diff --git a/tests/fixtures/simple-config-other/webpack.config.js b/tests/fixtures/simple-config-other/rspack.config.js similarity index 100% rename from tests/fixtures/simple-config-other/webpack.config.js rename to tests/fixtures/simple-config-other/rspack.config.js diff --git a/tests/fixtures/simple-config/webpack.config.js b/tests/fixtures/simple-config/rspack.config.js similarity index 100% rename from tests/fixtures/simple-config/webpack.config.js rename to tests/fixtures/simple-config/rspack.config.js diff --git a/tests/fixtures/static-config/webpack.config.js b/tests/fixtures/static-config/rspack.config.js similarity index 100% rename from tests/fixtures/static-config/webpack.config.js rename to tests/fixtures/static-config/rspack.config.js diff --git a/tests/fixtures/universal-compiler-config/webpack.config.js b/tests/fixtures/universal-compiler-config/rspack.config.js similarity index 100% rename from tests/fixtures/universal-compiler-config/webpack.config.js rename to tests/fixtures/universal-compiler-config/rspack.config.js diff --git a/tests/fixtures/watch-files-config/webpack.config.js b/tests/fixtures/watch-files-config/rspack.config.js similarity index 100% rename from tests/fixtures/watch-files-config/webpack.config.js rename to tests/fixtures/watch-files-config/rspack.config.js diff --git a/tests/fixtures/worker-config-dev-server-false/webpack.config.js b/tests/fixtures/worker-config-dev-server-false/rspack.config.js similarity index 100% rename from tests/fixtures/worker-config-dev-server-false/webpack.config.js rename to tests/fixtures/worker-config-dev-server-false/rspack.config.js diff --git a/tests/fixtures/worker-config/webpack.config.js b/tests/fixtures/worker-config/rspack.config.js similarity index 100% rename from tests/fixtures/worker-config/webpack.config.js rename to tests/fixtures/worker-config/rspack.config.js diff --git a/tests/helpers/normalize.js b/tests/helpers/normalize.js index 893a20b..136eef7 100644 --- a/tests/helpers/normalize.js +++ b/tests/helpers/normalize.js @@ -6,7 +6,7 @@ const ROOT = path.resolve(__dirname, '../../'); const CSS_LOADER = path.dirname(require.resolve('css-loader')); const RELATIVE_CSS_LOADER = path.relative( path.dirname( - path.resolve(__dirname, '../fixtures/reload-config/webpack.config'), + path.resolve(__dirname, '../fixtures/reload-config/rspack.config'), ), CSS_LOADER, ); diff --git a/tests/helpers/trusted-types-html-generator-plugin.js b/tests/helpers/trusted-types-html-generator-plugin.js index ed024f1..5c34ae9 100644 --- a/tests/helpers/trusted-types-html-generator-plugin.js +++ b/tests/helpers/trusted-types-html-generator-plugin.js @@ -4,7 +4,7 @@ const HTMLContentForIndex = `