Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/e2e/allowed-hosts.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'];

Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/api.test.js
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/app.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions tests/e2e/built-in-routes.test.js
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/client-reconnect.test.js
Original file line number Diff line number Diff line change
@@ -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'];

Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/client.test.js
Original file line number Diff line number Diff line change
@@ -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'];

Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/compress.test.js
Original file line number Diff line number Diff line change
@@ -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'];

Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/entry.test.js
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/headers.test.js
Original file line number Diff line number Diff line change
@@ -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'];
Expand Down
6 changes: 3 additions & 3 deletions tests/e2e/history-api-fallback.test.js
Original file line number Diff line number Diff line change
@@ -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'];

Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/host.test.js
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
34 changes: 16 additions & 18 deletions tests/e2e/hot-and-live-reload.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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'),
Expand All @@ -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`,
Expand All @@ -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'),
Expand All @@ -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'),
Expand All @@ -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'),
Expand Down Expand Up @@ -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 };

Expand Down Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/ipc.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions tests/e2e/lazy-compilation.test.js
Original file line number Diff line number Diff line change
@@ -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'];

Expand Down
20 changes: 10 additions & 10 deletions tests/e2e/logging.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down Expand Up @@ -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'),
Expand All @@ -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'));
},
Expand Down Expand Up @@ -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'),
Expand All @@ -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'),
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/mime-types.test.js
Original file line number Diff line number Diff line change
@@ -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'];

Expand Down
8 changes: 4 additions & 4 deletions tests/e2e/module-federation.test.js
Original file line number Diff line number Diff line change
@@ -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', () => {
Expand Down
6 changes: 3 additions & 3 deletions tests/e2e/multi-compiler.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'];

Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/on-listening.test.js
Original file line number Diff line number Diff line change
@@ -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'];

Expand Down
Loading