Skip to content

Commit 74388f1

Browse files
bernardobelchiorbernardobelchior
committed
Fix breaking changes
1 parent 915d98c commit 74388f1

File tree

28 files changed

+378
-420
lines changed

28 files changed

+378
-420
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
"@types/yargs": "^17.0.34",
9595
"@typescript-eslint/parser": "catalog:",
9696
"@vitejs/plugin-react": "catalog:",
97-
"@vitest/browser": "catalog:",
97+
"@vitest/browser-playwright": "catalog:",
9898
"@vitest/coverage-v8": "catalog:",
9999
"@vvago/vale": "^3.12.0",
100100
"axe-core": "4.11.0",

‎packages/x-charts-premium/vitest.config.browser.mts‎

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,16 @@
1-
/// <reference types="@vitest/browser/providers/playwright" />
2-
import { mergeConfig } from 'vitest/config';
1+
import { mergeConfig, defineConfig } from 'vitest/config';
32
import sharedConfig from '../../vitest.shared.mts';
43
import { getTestName } from '../../scripts/getTestName.mts';
54

6-
export default mergeConfig(sharedConfig, {
7-
test: {
8-
name: getTestName(import.meta.url),
9-
browser: {
10-
enabled: true,
11-
instances: [
12-
{
13-
browser: 'chromium',
14-
...(process.env.PLAYWRIGHT_SERVER_WS
15-
? {
16-
connect: {
17-
wsEndpoint: process.env.PLAYWRIGHT_SERVER_WS,
18-
},
19-
}
20-
: {}),
21-
},
22-
],
5+
export default mergeConfig(
6+
sharedConfig,
7+
defineConfig({
8+
test: {
9+
name: getTestName(import.meta.url),
10+
browser: {
11+
enabled: true,
12+
instances: [{ browser: 'chromium' }],
13+
},
2314
},
24-
},
25-
});
15+
}),
16+
);

‎packages/x-charts-pro/vitest.config.browser.mts‎

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,16 @@
1-
/// <reference types="@vitest/browser/providers/playwright" />
2-
import { mergeConfig } from 'vitest/config';
1+
import { mergeConfig, defineConfig } from 'vitest/config';
32
import sharedConfig from '../../vitest.shared.mts';
43
import { getTestName } from '../../scripts/getTestName.mts';
54

6-
export default mergeConfig(sharedConfig, {
7-
test: {
8-
name: getTestName(import.meta.url),
9-
browser: {
10-
enabled: true,
11-
instances: [
12-
{
13-
browser: 'chromium',
14-
...(process.env.PLAYWRIGHT_SERVER_WS
15-
? {
16-
connect: {
17-
wsEndpoint: process.env.PLAYWRIGHT_SERVER_WS,
18-
},
19-
}
20-
: {}),
21-
},
22-
],
5+
export default mergeConfig(
6+
sharedConfig,
7+
defineConfig({
8+
test: {
9+
name: getTestName(import.meta.url),
10+
browser: {
11+
enabled: true,
12+
instances: [{ browser: 'chromium' }],
13+
},
2314
},
24-
},
25-
});
15+
}),
16+
);

‎packages/x-charts-vendor/vitest.config.browser.mts‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
1-
/// <reference types="@vitest/browser/providers/playwright" />
2-
import { mergeConfig } from 'vitest/config';
1+
import { defineConfig, mergeConfig } from 'vitest/config';
32
import sharedConfig from '../../vitest.shared.mts';
43
import { getTestName } from '../../scripts/getTestName.mts';
54

6-
export default mergeConfig(sharedConfig, {
7-
test: {
8-
name: getTestName(import.meta.url),
9-
browser: {
10-
enabled: true,
11-
instances: [
12-
{
13-
browser: 'chromium',
14-
},
15-
],
5+
export default mergeConfig(
6+
sharedConfig,
7+
defineConfig({
8+
test: {
9+
name: getTestName(import.meta.url),
10+
browser: {
11+
enabled: true,
12+
instances: [{ browser: 'chromium' }],
13+
},
1614
},
17-
},
18-
});
15+
}),
16+
);

‎packages/x-charts/vitest.config.browser.mts‎

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,16 @@
1-
/// <reference types="@vitest/browser/providers/playwright" />
2-
import { mergeConfig } from 'vitest/config';
1+
import { mergeConfig, defineConfig } from 'vitest/config';
32
import sharedConfig from '../../vitest.shared.mts';
43
import { getTestName } from '../../scripts/getTestName.mts';
54

6-
export default mergeConfig(sharedConfig, {
7-
test: {
8-
name: getTestName(import.meta.url),
9-
browser: {
10-
enabled: true,
11-
instances: [
12-
{
13-
browser: 'chromium',
14-
...(process.env.PLAYWRIGHT_SERVER_WS
15-
? {
16-
connect: {
17-
wsEndpoint: process.env.PLAYWRIGHT_SERVER_WS,
18-
},
19-
}
20-
: {}),
21-
},
22-
],
5+
export default mergeConfig(
6+
sharedConfig,
7+
defineConfig({
8+
test: {
9+
name: getTestName(import.meta.url),
10+
browser: {
11+
enabled: true,
12+
instances: [{ browser: 'chromium' }],
13+
},
2314
},
24-
},
25-
});
15+
}),
16+
);

‎packages/x-data-grid-premium/vitest.config.browser.mts‎

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,16 @@
1-
/// <reference types="@vitest/browser/providers/playwright" />
2-
import { mergeConfig } from 'vitest/config';
1+
import { mergeConfig, defineConfig } from 'vitest/config';
32
import sharedConfig from '../../vitest.shared.mts';
43
import { getTestName } from '../../scripts/getTestName.mts';
54

6-
export default mergeConfig(sharedConfig, {
7-
test: {
8-
name: getTestName(import.meta.url),
9-
browser: {
10-
enabled: true,
11-
instances: [
12-
{
13-
browser: 'chromium',
14-
...(process.env.PLAYWRIGHT_SERVER_WS
15-
? {
16-
connect: {
17-
wsEndpoint: process.env.PLAYWRIGHT_SERVER_WS,
18-
},
19-
}
20-
: {}),
21-
},
22-
],
5+
export default mergeConfig(
6+
sharedConfig,
7+
defineConfig({
8+
test: {
9+
name: getTestName(import.meta.url),
10+
browser: {
11+
enabled: true,
12+
instances: [{ browser: 'chromium' }],
13+
},
2314
},
24-
},
25-
});
15+
}),
16+
);

‎packages/x-data-grid-pro/vitest.config.browser.mts‎

Lines changed: 31 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,35 @@
1-
/// <reference types="@vitest/browser/providers/playwright" />
2-
import { mergeConfig } from 'vitest/config';
1+
import { defineConfig, mergeConfig } from 'vitest/config';
2+
import { playwright } from '@vitest/browser-playwright';
33
import sharedConfig from '../../vitest.shared.mts';
44
import { getTestName } from '../../scripts/getTestName.mts';
55

6-
export default mergeConfig(sharedConfig, {
7-
test: {
8-
name: getTestName(import.meta.url),
9-
browser: {
10-
enabled: true,
11-
instances: [
12-
{
13-
browser: 'chromium',
14-
...(process.env.PLAYWRIGHT_SERVER_WS
15-
? {
16-
connect: {
17-
wsEndpoint: process.env.PLAYWRIGHT_SERVER_WS,
18-
},
19-
}
20-
: {
21-
launch: {
22-
// Required for tests which use scrollbars.
23-
ignoreDefaultArgs: ['--hide-scrollbars'],
24-
},
25-
}),
26-
},
27-
],
6+
export default mergeConfig(
7+
sharedConfig,
8+
defineConfig({
9+
test: {
10+
name: getTestName(import.meta.url),
11+
browser: {
12+
enabled: true,
13+
instances: [
14+
{
15+
browser: 'chromium',
16+
provider: playwright({
17+
...(process.env.PLAYWRIGHT_SERVER_WS
18+
? {
19+
connectOptions: {
20+
wsEndpoint: process.env.PLAYWRIGHT_SERVER_WS,
21+
},
22+
}
23+
: {
24+
launchOptions: {
25+
// Required for tests which use scrollbars.
26+
ignoreDefaultArgs: ['--hide-scrollbars'],
27+
},
28+
}),
29+
}),
30+
},
31+
],
32+
},
2833
},
29-
},
30-
});
34+
}),
35+
);

‎packages/x-data-grid/vitest.config.browser.mts‎

Lines changed: 31 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,35 @@
1-
/// <reference types="@vitest/browser/providers/playwright" />
2-
import { mergeConfig } from 'vitest/config';
1+
import { mergeConfig, defineConfig } from 'vitest/config';
2+
import { playwright } from '@vitest/browser-playwright';
33
import sharedConfig from '../../vitest.shared.mts';
44
import { getTestName } from '../../scripts/getTestName.mts';
55

6-
export default mergeConfig(sharedConfig, {
7-
test: {
8-
name: getTestName(import.meta.url),
9-
browser: {
10-
enabled: true,
11-
instances: [
12-
{
13-
browser: 'chromium',
14-
...(process.env.PLAYWRIGHT_SERVER_WS
15-
? {
16-
connect: {
17-
wsEndpoint: process.env.PLAYWRIGHT_SERVER_WS,
18-
},
19-
}
20-
: {
21-
launch: {
22-
// Required for tests which use scrollbars.
23-
ignoreDefaultArgs: ['--hide-scrollbars'],
24-
},
25-
}),
26-
},
27-
],
6+
export default mergeConfig(
7+
sharedConfig,
8+
defineConfig({
9+
test: {
10+
name: getTestName(import.meta.url),
11+
browser: {
12+
enabled: true,
13+
instances: [
14+
{
15+
browser: 'chromium',
16+
provider: playwright({
17+
...(process.env.PLAYWRIGHT_SERVER_WS
18+
? {
19+
connectOptions: {
20+
wsEndpoint: process.env.PLAYWRIGHT_SERVER_WS,
21+
},
22+
}
23+
: {
24+
launchOptions: {
25+
// Required for tests which use scrollbars.
26+
ignoreDefaultArgs: ['--hide-scrollbars'],
27+
},
28+
}),
29+
}),
30+
},
31+
],
32+
},
2833
},
29-
},
30-
});
34+
}),
35+
);

‎packages/x-date-pickers-pro/vitest.config.browser.mts‎

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,18 @@
1-
/// <reference types="@vitest/browser/providers/playwright" />
21
import { fileURLToPath } from 'node:url';
3-
import { mergeConfig } from 'vitest/config';
2+
import { mergeConfig, defineConfig } from 'vitest/config';
43
import sharedConfig from '../../vitest.shared.mts';
54
import { getTestName } from '../../scripts/getTestName.mts';
65

7-
export default mergeConfig(sharedConfig, {
8-
test: {
9-
name: getTestName(import.meta.url),
10-
setupFiles: [fileURLToPath(new URL('../../test/utils/setupPickers.js', import.meta.url))],
11-
browser: {
12-
enabled: true,
13-
instances: [
14-
{
15-
browser: 'chromium',
16-
...(process.env.PLAYWRIGHT_SERVER_WS
17-
? {
18-
connect: {
19-
wsEndpoint: process.env.PLAYWRIGHT_SERVER_WS,
20-
},
21-
}
22-
: {}),
23-
},
24-
],
6+
export default mergeConfig(
7+
sharedConfig,
8+
defineConfig({
9+
test: {
10+
name: getTestName(import.meta.url),
11+
setupFiles: [fileURLToPath(new URL('../../test/utils/setupPickers.js', import.meta.url))],
12+
browser: {
13+
enabled: true,
14+
instances: [{ browser: 'chromium' }],
15+
},
2516
},
26-
},
27-
});
17+
}),
18+
);

0 commit comments

Comments
 (0)