diff --git a/package.json b/package.json index 8271c9cec..f8839c0a9 100644 --- a/package.json +++ b/package.json @@ -19,8 +19,8 @@ "test:benchmark": "cd ./tests && pnpm run test:benchmark", "test:e2e": "pnpm run build:examples && cd tests && pnpm run test:e2e", "test:ecosystem-ci": "pnpm run test:unit && cross-env ECO_CI=1 pnpm run test:integration && pnpm run test:e2e", - "test:integration": "pnpm -r --filter \"./tests\" run test", - "test:unit": "pnpm -r --filter \"./packages/**\" run test", + "test:integration": "rstest run --project integration", + "test:unit": "rstest run --project unit*", "testu": "pnpm run test:unit -u && pnpm run test:integration -u", "type-check": "pnpm -r run type-check", "update:rsbuild": "npx taze minor --include /rsbuild/ -w -r -l", @@ -44,7 +44,7 @@ "@biomejs/biome": "^2.2.2", "@changesets/cli": "^2.29.6", "@rslint/core": "^0.1.12", - "@rstest/core": "^0.3.0", + "@rstest/core": "^0.3.1", "@types/fs-extra": "^11.0.4", "@types/node": "^22.18.0", "check-dependency-version-consistency": "^5.0.1", diff --git a/packages/core/rstest.config.ts b/packages/core/rstest.config.ts index cd7e33c6a..6c5bb2e99 100644 --- a/packages/core/rstest.config.ts +++ b/packages/core/rstest.config.ts @@ -1,5 +1,5 @@ import { defineConfig } from '@rstest/core'; -import { shared } from '../../rstest.workspace'; +import { shared } from '../../rstest.config'; export default defineConfig({ ...shared, diff --git a/packages/core/tests/config.test.ts b/packages/core/tests/config.test.ts index eef1ecb65..91f166d74 100644 --- a/packages/core/tests/config.test.ts +++ b/packages/core/tests/config.test.ts @@ -189,6 +189,7 @@ describe('Should compose create Rsbuild config correctly', () => { source: { preEntry: './a.js', }, + root: join(__dirname, '..'), resolve: { alias: { foo: 'foo', diff --git a/packages/create-rslib/fragments/tools/rstest-node-js/package.json b/packages/create-rslib/fragments/tools/rstest-node-js/package.json index af85761d3..d0a99f9e6 100644 --- a/packages/create-rslib/fragments/tools/rstest-node-js/package.json +++ b/packages/create-rslib/fragments/tools/rstest-node-js/package.json @@ -3,6 +3,6 @@ "test": "rstest" }, "devDependencies": { - "@rstest/core": "^0.3.0" + "@rstest/core": "^0.3.1" } } diff --git a/packages/create-rslib/fragments/tools/rstest-node-ts/package.json b/packages/create-rslib/fragments/tools/rstest-node-ts/package.json index af85761d3..d0a99f9e6 100644 --- a/packages/create-rslib/fragments/tools/rstest-node-ts/package.json +++ b/packages/create-rslib/fragments/tools/rstest-node-ts/package.json @@ -3,6 +3,6 @@ "test": "rstest" }, "devDependencies": { - "@rstest/core": "^0.3.0" + "@rstest/core": "^0.3.1" } } diff --git a/packages/create-rslib/fragments/tools/rstest-react-js/package.json b/packages/create-rslib/fragments/tools/rstest-react-js/package.json index e16ffd5da..0bf77d903 100644 --- a/packages/create-rslib/fragments/tools/rstest-react-js/package.json +++ b/packages/create-rslib/fragments/tools/rstest-react-js/package.json @@ -3,7 +3,7 @@ "test": "rstest" }, "devDependencies": { - "@rstest/core": "^0.3.0", + "@rstest/core": "^0.3.1", "@testing-library/jest-dom": "^6.8.0", "@testing-library/react": "^16.3.0", "jsdom": "^26.1.0" diff --git a/packages/create-rslib/fragments/tools/rstest-react-ts/package.json b/packages/create-rslib/fragments/tools/rstest-react-ts/package.json index e16ffd5da..0bf77d903 100644 --- a/packages/create-rslib/fragments/tools/rstest-react-ts/package.json +++ b/packages/create-rslib/fragments/tools/rstest-react-ts/package.json @@ -3,7 +3,7 @@ "test": "rstest" }, "devDependencies": { - "@rstest/core": "^0.3.0", + "@rstest/core": "^0.3.1", "@testing-library/jest-dom": "^6.8.0", "@testing-library/react": "^16.3.0", "jsdom": "^26.1.0" diff --git a/packages/create-rslib/fragments/tools/rstest-vue-js/package.json b/packages/create-rslib/fragments/tools/rstest-vue-js/package.json index f4daf2ec1..ca331d3a2 100644 --- a/packages/create-rslib/fragments/tools/rstest-vue-js/package.json +++ b/packages/create-rslib/fragments/tools/rstest-vue-js/package.json @@ -3,7 +3,7 @@ "test": "rstest" }, "devDependencies": { - "@rstest/core": "^0.3.0", + "@rstest/core": "^0.3.1", "@testing-library/jest-dom": "^6.8.0", "@testing-library/vue": "^8.1.0", "@vue/test-utils": "^2.4.6", diff --git a/packages/create-rslib/fragments/tools/rstest-vue-ts/package.json b/packages/create-rslib/fragments/tools/rstest-vue-ts/package.json index f4daf2ec1..ca331d3a2 100644 --- a/packages/create-rslib/fragments/tools/rstest-vue-ts/package.json +++ b/packages/create-rslib/fragments/tools/rstest-vue-ts/package.json @@ -3,7 +3,7 @@ "test": "rstest" }, "devDependencies": { - "@rstest/core": "^0.3.0", + "@rstest/core": "^0.3.1", "@testing-library/jest-dom": "^6.8.0", "@testing-library/vue": "^8.1.0", "@vue/test-utils": "^2.4.6", diff --git a/packages/create-rslib/rstest.config.ts b/packages/create-rslib/rstest.config.ts index 3fa38f782..bf33a590c 100644 --- a/packages/create-rslib/rstest.config.ts +++ b/packages/create-rslib/rstest.config.ts @@ -1,5 +1,5 @@ import { defineConfig } from '@rstest/core'; -import { shared } from '../../rstest.workspace'; +import { shared } from '../../rstest.config'; export default defineConfig({ ...shared, diff --git a/packages/create-rslib/template-[node-dual]-[rstest]-js/package.json b/packages/create-rslib/template-[node-dual]-[rstest]-js/package.json index 573afbb3f..f54b23b8a 100644 --- a/packages/create-rslib/template-[node-dual]-[rstest]-js/package.json +++ b/packages/create-rslib/template-[node-dual]-[rstest]-js/package.json @@ -19,6 +19,6 @@ }, "devDependencies": { "@rslib/core": "workspace:*", - "@rstest/core": "^0.3.0" + "@rstest/core": "^0.3.1" } } diff --git a/packages/create-rslib/template-[node-dual]-[rstest]-ts/package.json b/packages/create-rslib/template-[node-dual]-[rstest]-ts/package.json index c4a4bf041..8941541fa 100644 --- a/packages/create-rslib/template-[node-dual]-[rstest]-ts/package.json +++ b/packages/create-rslib/template-[node-dual]-[rstest]-ts/package.json @@ -21,7 +21,7 @@ }, "devDependencies": { "@rslib/core": "workspace:*", - "@rstest/core": "^0.3.0", + "@rstest/core": "^0.3.1", "@types/node": "^22.18.0", "typescript": "^5.9.2" } diff --git a/packages/create-rslib/template-[node-esm]-[rstest]-js/package.json b/packages/create-rslib/template-[node-esm]-[rstest]-js/package.json index 28f4a29f5..89f086e96 100644 --- a/packages/create-rslib/template-[node-esm]-[rstest]-js/package.json +++ b/packages/create-rslib/template-[node-esm]-[rstest]-js/package.json @@ -17,6 +17,6 @@ }, "devDependencies": { "@rslib/core": "workspace:*", - "@rstest/core": "^0.3.0" + "@rstest/core": "^0.3.1" } } diff --git a/packages/create-rslib/template-[node-esm]-[rstest]-ts/package.json b/packages/create-rslib/template-[node-esm]-[rstest]-ts/package.json index c5a021a93..3322bc21f 100644 --- a/packages/create-rslib/template-[node-esm]-[rstest]-ts/package.json +++ b/packages/create-rslib/template-[node-esm]-[rstest]-ts/package.json @@ -19,7 +19,7 @@ }, "devDependencies": { "@rslib/core": "workspace:*", - "@rstest/core": "^0.3.0", + "@rstest/core": "^0.3.1", "@types/node": "^22.18.0", "typescript": "^5.9.2" } diff --git a/packages/create-rslib/template-[react]-[rstest,storybook]-js/package.json b/packages/create-rslib/template-[react]-[rstest,storybook]-js/package.json index 86ea87839..6ac02560d 100644 --- a/packages/create-rslib/template-[react]-[rstest,storybook]-js/package.json +++ b/packages/create-rslib/template-[react]-[rstest,storybook]-js/package.json @@ -21,7 +21,7 @@ "@rsbuild/core": "~1.5.1", "@rsbuild/plugin-react": "^1.3.5", "@rslib/core": "workspace:*", - "@rstest/core": "^0.3.0", + "@rstest/core": "^0.3.1", "@storybook/addon-docs": "^9.1.3", "@storybook/addon-essentials": "^9.0.0-alpha.12", "@storybook/addon-interactions": "^9.0.0-alpha.10", diff --git a/packages/create-rslib/template-[react]-[rstest,storybook]-ts/package.json b/packages/create-rslib/template-[react]-[rstest,storybook]-ts/package.json index ca400af6a..451bc4f14 100644 --- a/packages/create-rslib/template-[react]-[rstest,storybook]-ts/package.json +++ b/packages/create-rslib/template-[react]-[rstest,storybook]-ts/package.json @@ -23,7 +23,7 @@ "@rsbuild/core": "~1.5.1", "@rsbuild/plugin-react": "^1.3.5", "@rslib/core": "workspace:*", - "@rstest/core": "^0.3.0", + "@rstest/core": "^0.3.1", "@storybook/addon-docs": "^9.1.3", "@storybook/addon-essentials": "^9.0.0-alpha.12", "@storybook/addon-interactions": "^9.0.0-alpha.10", diff --git a/packages/create-rslib/template-[react]-[rstest]-js/package.json b/packages/create-rslib/template-[react]-[rstest]-js/package.json index fb307f068..ab0e896db 100644 --- a/packages/create-rslib/template-[react]-[rstest]-js/package.json +++ b/packages/create-rslib/template-[react]-[rstest]-js/package.json @@ -18,7 +18,7 @@ "devDependencies": { "@rsbuild/plugin-react": "^1.3.5", "@rslib/core": "workspace:*", - "@rstest/core": "^0.3.0", + "@rstest/core": "^0.3.1", "@testing-library/jest-dom": "^6.8.0", "@testing-library/react": "^16.3.0", "jsdom": "^26.1.0", diff --git a/packages/create-rslib/template-[react]-[rstest]-ts/package.json b/packages/create-rslib/template-[react]-[rstest]-ts/package.json index 6afeb3914..c844ce15b 100644 --- a/packages/create-rslib/template-[react]-[rstest]-ts/package.json +++ b/packages/create-rslib/template-[react]-[rstest]-ts/package.json @@ -20,7 +20,7 @@ "devDependencies": { "@rsbuild/plugin-react": "^1.3.5", "@rslib/core": "workspace:*", - "@rstest/core": "^0.3.0", + "@rstest/core": "^0.3.1", "@testing-library/jest-dom": "^6.8.0", "@testing-library/react": "^16.3.0", "@types/react": "^19.1.12", diff --git a/packages/create-rslib/template-[vue]-[rstest,storybook]-js/package.json b/packages/create-rslib/template-[vue]-[rstest,storybook]-js/package.json index 82ca61fcd..927d53285 100644 --- a/packages/create-rslib/template-[vue]-[rstest,storybook]-js/package.json +++ b/packages/create-rslib/template-[vue]-[rstest,storybook]-js/package.json @@ -22,7 +22,7 @@ "devDependencies": { "@rsbuild/core": "~1.5.1", "@rslib/core": "workspace:*", - "@rstest/core": "^0.3.0", + "@rstest/core": "^0.3.1", "@storybook/addon-docs": "^9.1.3", "@storybook/addon-essentials": "^9.0.0-alpha.12", "@storybook/addon-interactions": "^9.0.0-alpha.10", diff --git a/packages/create-rslib/template-[vue]-[rstest,storybook]-ts/package.json b/packages/create-rslib/template-[vue]-[rstest,storybook]-ts/package.json index 7d44810c2..2fe881de2 100644 --- a/packages/create-rslib/template-[vue]-[rstest,storybook]-ts/package.json +++ b/packages/create-rslib/template-[vue]-[rstest,storybook]-ts/package.json @@ -22,7 +22,7 @@ "devDependencies": { "@rsbuild/core": "~1.5.1", "@rslib/core": "workspace:*", - "@rstest/core": "^0.3.0", + "@rstest/core": "^0.3.1", "@storybook/addon-docs": "^9.1.3", "@storybook/addon-essentials": "^9.0.0-alpha.12", "@storybook/addon-interactions": "^9.0.0-alpha.10", diff --git a/packages/create-rslib/template-[vue]-[rstest]-js/package.json b/packages/create-rslib/template-[vue]-[rstest]-js/package.json index bee67c054..10cc1f174 100644 --- a/packages/create-rslib/template-[vue]-[rstest]-js/package.json +++ b/packages/create-rslib/template-[vue]-[rstest]-js/package.json @@ -19,7 +19,7 @@ }, "devDependencies": { "@rslib/core": "workspace:*", - "@rstest/core": "^0.3.0", + "@rstest/core": "^0.3.1", "@testing-library/jest-dom": "^6.8.0", "@testing-library/vue": "^8.1.0", "@vue/test-utils": "^2.4.6", diff --git a/packages/create-rslib/template-[vue]-[rstest]-ts/package.json b/packages/create-rslib/template-[vue]-[rstest]-ts/package.json index 94c213f7c..3a1ddc713 100644 --- a/packages/create-rslib/template-[vue]-[rstest]-ts/package.json +++ b/packages/create-rslib/template-[vue]-[rstest]-ts/package.json @@ -19,7 +19,7 @@ }, "devDependencies": { "@rslib/core": "workspace:*", - "@rstest/core": "^0.3.0", + "@rstest/core": "^0.3.1", "@testing-library/jest-dom": "^6.8.0", "@testing-library/vue": "^8.1.0", "@vue/test-utils": "^2.4.6", diff --git a/packages/plugin-dts/rstest.config.ts b/packages/plugin-dts/rstest.config.ts index ac0839048..4adda01f4 100644 --- a/packages/plugin-dts/rstest.config.ts +++ b/packages/plugin-dts/rstest.config.ts @@ -1,5 +1,5 @@ import { defineConfig } from '@rstest/core'; -import { shared } from '../../rstest.workspace'; +import { shared } from '../../rstest.config'; // Disable color in test process.env.NO_COLOR = '1'; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 399d5fabe..4eb9ed11d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -21,8 +21,8 @@ importers: specifier: ^0.1.12 version: 0.1.12 '@rstest/core': - specifier: ^0.3.0 - version: 0.3.0 + specifier: ^0.3.1 + version: 0.3.1 '@types/fs-extra': specifier: ^11.0.4 version: 11.0.4 @@ -2816,8 +2816,8 @@ packages: '@rstack-dev/doc-ui@1.11.0': resolution: {integrity: sha512-5GZ8EwvmKj8LXomEElC4GhDlDW2SazCeHbA+ieacJrlcGduuiJXGTBzVA2rNnPLjAb41H0esuy0aH0skRIQAqA==} - '@rstest/core@0.3.0': - resolution: {integrity: sha512-R/pETy1rJG6tDL8FvfCiaFt4R/nc1N0JhsBW3Ldrgj3ADgQgR9P6hDDjR4pBGy8HR5gH4utCacICwLTsJnmNww==} + '@rstest/core@0.3.1': + resolution: {integrity: sha512-bTFhWWhf84EsrSazUrpIdCJHlWvK2HfP90B+vRx6Y8K+rCaRtq6tQo3d9atjRT/ttvw+gSR1Zdy1daiqEVI8Ng==} engines: {node: '>=18.12.0'} hasBin: true peerDependencies: @@ -9526,7 +9526,7 @@ snapshots: - react - react-dom - '@rstest/core@0.3.0': + '@rstest/core@0.3.1': dependencies: '@rsbuild/core': 1.5.0 '@types/chai': 5.2.2 diff --git a/rstest.config.ts b/rstest.config.ts new file mode 100644 index 000000000..bddba1db3 --- /dev/null +++ b/rstest.config.ts @@ -0,0 +1,14 @@ +// import type { ProjectConfig } from '@rstest/core'; +import { defineConfig, type RstestConfig } from '@rstest/core'; + +export const shared: RstestConfig = { + globals: true, + testEnvironment: 'node', + testTimeout: 60_000, + hookTimeout: 50_000, + restoreMocks: true, +}; + +export default defineConfig({ + projects: ['packages/*', 'tests'], +}); diff --git a/rstest.workspace.ts b/rstest.workspace.ts deleted file mode 100644 index c4cc82660..000000000 --- a/rstest.workspace.ts +++ /dev/null @@ -1,15 +0,0 @@ -// TODO: projects is not supported in Rstest yet, so we use a single config file for now. - -// import type { ProjectConfig } from '@rstest/core'; -import type { RstestConfig } from '@rstest/core'; - -export const shared: RstestConfig = { - globals: true, - testEnvironment: 'node', - testTimeout: 60_000, - hookTimeout: 50_000, - restoreMocks: true, - exclude: ['**/node_modules/**'], -}; - -// export default defineWorkspace(['packages/*', 'tests']); diff --git a/tests/rstest.config.ts b/tests/rstest.config.ts index 3f899bebf..adde17b05 100644 --- a/tests/rstest.config.ts +++ b/tests/rstest.config.ts @@ -1,6 +1,6 @@ // import codspeedPlugin from '@codspeed/vitest-plugin'; import { defineConfig } from '@rstest/core'; -import { shared } from '../rstest.workspace'; +import { shared } from '../rstest.config'; export default defineConfig({ ...shared,