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
24 changes: 16 additions & 8 deletions e2e/helper/fixture.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@ import {
import { constants as fsConstants, promises } from 'node:fs';
import path from 'node:path';
import { expect, test as base } from '@rstest/playwright';
import type { PlaywrightOptions } from '@rstest/playwright';
import type { PlaywrightFixture, PlaywrightOptions } from '@rstest/playwright';
import {
copyNodeModules as baseCopyNodeModules,
editFile as baseEditFile,
type FileEditor,
prepareDist as basePrepareDist,
} from '@rstackjs/test-utils';
import fse from 'fs-extra';
import type { TestContext, TestOptions } from 'rstack/test';
import { RSBUILD_BIN_PATH } from './constants.ts';
import {
type Build,
Expand Down Expand Up @@ -182,12 +183,6 @@ type RsbuildFixture = {
execCliSync: ExecSync;
};

// Make custom fixtures available to Rstest hook callbacks.
declare module '@rstest/core' {
// rslint-disable-next-line @typescript-eslint/no-empty-object-type
interface TestContext extends RsbuildFixture {}
}

type Close = DevResult['close'];

const setupExecOptions = <T extends SpawnOptions | ExecSyncOptions>(options: T, cwd: string): T => {
Expand Down Expand Up @@ -405,6 +400,19 @@ const rsbuildTest = rsbuildBase.extend<RsbuildFixture>({
},
});

export const test = rsbuildTest;
// TODO: Remove these hook type overrides after https://github.com/web-infra-dev/rstest/pull/1604 is released.
type MaybePromise<T> = T | Promise<T>;
type RsbuildTestContext = TestContext & PlaywrightFixture & RsbuildFixture;
type TestCallback = (context: RsbuildTestContext) => MaybePromise<void>;
type AfterEachCallback = (context: RsbuildTestContext) => MaybePromise<void>;
type BeforeEachCallback = (context: RsbuildTestContext) => MaybePromise<void | AfterEachCallback>;
type RsbuildTest = Omit<typeof rsbuildTest, 'afterEach' | 'beforeEach'> & {
(description: string, callback?: TestCallback, timeout?: number): void;
(description: string, options: TestOptions, callback?: TestCallback): void;
afterEach: (callback: AfterEachCallback, timeout?: number) => void;
beforeEach: (callback: BeforeEachCallback, timeout?: number) => void;
};

export const test = rsbuildTest as unknown as RsbuildTest;

export { expect };
3 changes: 1 addition & 2 deletions e2e/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"type": "module",
"scripts": {
"setup": "pnpm exec playwright install chromium --with-deps",
"e2e": "rstest"
"e2e": "rs test"
},
"dependencies": {
"@module-federation/runtime-tools": "catalog:",
Expand Down Expand Up @@ -38,7 +38,6 @@
"@rsbuild/plugin-type-check": "catalog:",
"@rsbuild/plugin-vue": "workspace:*",
"@rstackjs/test-utils": "catalog:",
"@rstest/core": "catalog:",
"@rstest/playwright": "catalog:",
"@scripts/test-helper": "workspace:*",
"@tailwindcss/postcss": "catalog:",
Expand Down
26 changes: 26 additions & 0 deletions e2e/rstack.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import { define } from 'rstack';

define.test(() => {
// Disable color in test.
process.env.NO_COLOR = '1';

// https://playwright.dev/docs/service-workers-experimental
process.env.PW_EXPERIMENTAL_SERVICE_WORKER_NETWORK_EVENTS = '1';

const isCI = Boolean(process.env.CI);

return {
include: ['cases/**/*.test.ts'],
exclude: ['**/node_modules/**', '**/.*/**', '**/test-temp-*/**'],
reporters: ['default', ['github-actions', { annotations: false }]],
isolate: false,
// Existing e2e helpers capture build logs synchronously; interception delays them.
disableConsoleIntercept: true,
retry: isCI ? 3 : 0,
testTimeout: 30_000,
hookTimeout: 30_000,
output: {
externals: ['@rsbuild/core'],
},
};
});
24 changes: 0 additions & 24 deletions e2e/rstest.config.ts

This file was deleted.

2 changes: 1 addition & 1 deletion e2e/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
},
"include": [
"helper",
"rstest.config.ts",
"rstack.config.ts",
"cases/**/*.test.ts",
"cases/**/*.config.ts",
"cases/javascript-api/server-custom-message/src/**/*.ts"
Expand Down
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,11 @@
"prebundle": "pnpm --parallel --filter \"./packages/*\" run prebundle",
"prepare": "simple-git-hooks && node --run prebundle",
"sort-package-json": "pnpx sort-package-json \"./package.json\" \"packages/*/package.json\"",
"test": "rstest",
"test:watch": "rstest watch"
"test": "rs test",
"test:watch": "rs test watch"
},
"devDependencies": {
"@rstest/adapter-rslib": "catalog:",
"@rstest/core": "catalog:",
"@scripts/config": "workspace:*",
"@scripts/test-helper": "workspace:*",
"@types/node": "catalog:",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/tests/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"extends": "@scripts/config/tsconfig",
"compilerOptions": {
"types": ["@rstest/core/globals"]
"types": ["rstack/test/globals"]
},
"include": ["./**/*.ts", "../src/env.d.ts"]
}
2 changes: 1 addition & 1 deletion packages/plugin-babel/tests/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"extends": "@scripts/config/tsconfig",
"compilerOptions": {
"types": ["@rstest/core/globals"]
"types": ["rstack/test/globals"]
},
"include": ["./**/*.ts"]
}
2 changes: 1 addition & 1 deletion packages/plugin-less/tests/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"extends": "@scripts/config/tsconfig",
"compilerOptions": {
"types": ["@rstest/core/globals"]
"types": ["rstack/test/globals"]
},
"include": ["./**/*.ts"]
}
2 changes: 1 addition & 1 deletion packages/plugin-preact/tests/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"extends": "@scripts/config/tsconfig",
"compilerOptions": {
"types": ["@rstest/core/globals"]
"types": ["rstack/test/globals"]
},
"include": ["./**/*.ts"]
}
2 changes: 1 addition & 1 deletion packages/plugin-react/tests/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"extends": "@scripts/config/tsconfig",
"compilerOptions": {
"types": ["@rstest/core/globals"]
"types": ["rstack/test/globals"]
},
"include": ["./**/*.ts"]
}
2 changes: 1 addition & 1 deletion packages/plugin-sass/tests/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"extends": "@scripts/config/tsconfig",
"compilerOptions": {
"types": ["@rstest/core/globals"]
"types": ["rstack/test/globals"]
},
"include": ["./**/*.ts"]
}
2 changes: 1 addition & 1 deletion packages/plugin-solid/tests/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"extends": "@scripts/config/tsconfig",
"compilerOptions": {
"types": ["@rstest/core/globals"]
"types": ["rstack/test/globals"]
},
"include": ["./**/*.ts"]
}
2 changes: 1 addition & 1 deletion packages/plugin-svelte/tests/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"extends": "@scripts/config/tsconfig",
"compilerOptions": {
"types": ["@rstest/core/globals"]
"types": ["rstack/test/globals"]
},
"include": ["./**/*.ts"]
}
2 changes: 1 addition & 1 deletion packages/plugin-svgr/tests/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"extends": "@scripts/config/tsconfig",
"compilerOptions": {
"types": ["@rstest/core/globals"]
"types": ["rstack/test/globals"]
},
"include": ["./**/*.ts"]
}
2 changes: 1 addition & 1 deletion packages/plugin-tailwindcss/tests/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"extends": "@scripts/config/tsconfig",
"compilerOptions": {
"types": ["@rstest/core/globals"]
"types": ["rstack/test/globals"]
},
"include": ["./**/*.ts"]
}
2 changes: 1 addition & 1 deletion packages/plugin-vue/tests/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"extends": "@scripts/config/tsconfig",
"compilerOptions": {
"types": ["@rstest/core/globals"]
"types": ["rstack/test/globals"]
},
"include": ["./**/*.ts"]
}
61 changes: 6 additions & 55 deletions pnpm-lock.yaml

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

1 change: 0 additions & 1 deletion pnpm-workspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ catalog:
'@rstackjs/load-config': '^0.1.2'
'@rstackjs/test-utils': '^0.2.0'
'@rstest/adapter-rslib': '^0.11.2'
'@rstest/core': '^0.11.2'
'@rstest/playwright': '^0.11.2'
'@shikijs/transformers': '^4.3.1'
'@svgr/core': '8.1.0'
Expand Down
Loading