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 package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"cross-env": "^10.1.0",
"husky": "^9.1.7",
"is-ci": "4.1.0",
"@rstest/core": "^0.7.8",
"@rstest/core": "^0.7.9",
"lint-staged": "^16.2.7",
"prettier": "3.7.4",
"prettier-2": "npm:prettier@2.8.8",
Expand Down
1 change: 1 addition & 0 deletions packages/rspack-cli/rstest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export default defineConfig({
},
output: {
externals: [/@rspack\/core/],
module: false,
},
env: {
RUST_BACKTRACE: 'full',
Expand Down
14 changes: 7 additions & 7 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions tests/rspack-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
"author": "",
"license": "ISC",
"scripts": {
"test": "cross-env RUST_BACKTRACE=full pnpm run --stream /^test:.*/",
"testu": "pnpm run --stream /^test:.*/ -u",
"test:base": "rstest",
"test:hot": "cross-env RSPACK_HOT_TEST=true node --no-warnings --expose-gc --max-old-space-size=8192 --experimental-vm-modules ../../node_modules/@rstest/core/bin/rstest --config ./rstest.config.hot.ts --passWithNoTests"
"test": "rstest",
"testu": "rstest -u",
"test:base": "rstest --project base",
"test:hot": "rstest --project hottest"
},
"devDependencies": {
"@rspack/cli": "workspace:*",
Expand All @@ -19,7 +19,7 @@
"@rspack/plugin-preact-refresh": "1.1.4",
"@rspack/plugin-react-refresh": "^1.6.0",
"@rspack/test-tools": "workspace:*",
"@rstest/core": "^0.7.8",
"@rstest/core": "^0.7.9",
"@swc/helpers": "0.5.18",
"@swc/plugin-remove-console": "^12.1.0",
"@types/babel__generator": "7.27.0",
Expand Down
7 changes: 0 additions & 7 deletions tests/rspack-test/rstest.config.hot.ts

This file was deleted.

41 changes: 26 additions & 15 deletions tests/rspack-test/rstest.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import path from 'node:path';
import { defineConfig } from '@rstest/core';
import { defineConfig, defineProject, type ProjectConfig } from '@rstest/core';

const root = path.resolve(__dirname, "../../");

process.env.NO_COLOR = '1';
Expand All @@ -9,7 +10,7 @@ const setupFilesAfterEnv = [
"@rspack/test-tools/setup-expect",
];

const wasmConfig = process.env.WASM && defineConfig({
const wasmConfig = process.env.WASM && defineProject({
setupFiles: [...setupFilesAfterEnv, "@rspack/test-tools/setup-wasm"],
exclude: [
// Skip because they rely on snapshots
Expand All @@ -31,20 +32,16 @@ const wasmConfig = process.env.WASM && defineConfig({
"NativeWatcher*.test.js",
],
maxConcurrency: 1,
pool: {
maxWorkers: 1,
execArgv: ['--no-warnings', '--expose-gc', '--max-old-space-size=6144', '--experimental-vm-modules'],
}
});

export default defineConfig({
const sharedConfig = defineProject({
setupFiles: setupFilesAfterEnv,
testTimeout: process.env.CI ? 60000 : 30000,
include: [
"*.test.js",
],
slowTestThreshold: 5000,
// Retry on CI to reduce flakes
// Retry on CI to reduce flakes
retry: process.env.CI ? 3 : 0,
resolve: {
alias: {
Expand All @@ -70,13 +67,9 @@ export default defineConfig({
chaiConfig: process.env.CI ? {
// show all info on CI
truncateThreshold: 5000,

} : undefined,
pool: {
maxWorkers: "80%",
execArgv: ['--no-warnings', '--expose-gc', '--max-old-space-size=8192', '--experimental-vm-modules'],
},
env: {
RUST_BACKTRACE: 'full',
updateSnapshot:
process.argv.includes("-u") || process.argv.includes("--updateSnapshot") ? 'true' : 'false',
RSPACK_DEV: 'false',
Expand Down Expand Up @@ -104,8 +97,26 @@ export default defineConfig({
__RSPACK_TEST_TOOLS_PATH__: path.resolve(root, "packages/rspack-test-tools"),
__DEBUG__: process.env.DEBUG === "test" ? 'true' : 'false',
},
hideSkippedTests: true,
reporters: ['default'],
...(wasmConfig || {}),
}) as ProjectConfig;

export default defineConfig({
projects: [{
extends: sharedConfig,
name: 'base',
}, {
extends: sharedConfig,
name: 'hottest',
include: process.env.WASM ? [] : ["<rootDir>/*.hottest.js"],
env: {
RSPACK_HOT_TEST: 'true',
},
}],
reporters: ['default'],
hideSkippedTests: true,
pool: {
maxWorkers: process.env.WASM ? 1 : "80%",
execArgv: ['--no-warnings', '--expose-gc', '--max-old-space-size=8192', '--experimental-vm-modules'],
},
});

Loading