Skip to content

[code-infra] Strengthen URL usage for test config #18444

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 19, 2025
Merged

[code-infra] Strengthen URL usage for test config #18444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e07297
[code-infra] Strengthen `URL`usage for test config
LukasTy Jun 19, 2025
72c97ce
Update packages/x-internal-gestures/vitest.config.browser.mts
LukasTy Jun 19, 2025
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
3 changes: 2 additions & 1 deletion packages/x-date-pickers-pro/vitest.config.browser.mts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/// <reference types="@vitest/browser/providers/playwright" />
import { fileURLToPath } from 'node:url';
import { mergeConfig } from 'vitest/config';
import sharedConfig from '../../vitest.shared.mts';
import { getTestName } from '../../scripts/getTestName.mts';
Expand All @@ -7,7 +8,7 @@ export default mergeConfig(sharedConfig, {
test: {
name: getTestName(import.meta.url),
environment: 'browser',
setupFiles: [new URL('../../test/utils/setupPickers.js', import.meta.url).pathname],
setupFiles: [fileURLToPath(new URL('../../test/utils/setupPickers.js', import.meta.url))],
Copy link
Member

@Janpot Janpot Jun 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI: on modern enough versions of node you'd just do:

path.resolve(import.meta.dirname, '../../test/utils/setupPickers.js')

browser: {
enabled: true,
instances: [
Expand Down
3 changes: 2 additions & 1 deletion packages/x-date-pickers-pro/vitest.config.jsdom.mts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { fileURLToPath } from 'node:url';
import { mergeConfig } from 'vitest/config';
import sharedConfig from '../../vitest.shared.mts';
import { getTestName } from '../../scripts/getTestName.mts';
Expand All @@ -6,6 +7,6 @@ export default mergeConfig(sharedConfig, {
test: {
name: getTestName(import.meta.url),
environment: 'jsdom',
setupFiles: [new URL('../../test/utils/setupPickers.js', import.meta.url).pathname],
setupFiles: [fileURLToPath(new URL('../../test/utils/setupPickers.js', import.meta.url))],
},
});
3 changes: 2 additions & 1 deletion packages/x-date-pickers/vitest.config.browser.mts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/// <reference types="@vitest/browser/providers/playwright" />
import { fileURLToPath } from 'node:url';
import { mergeConfig } from 'vitest/config';
import sharedConfig from '../../vitest.shared.mts';

Expand All @@ -18,7 +19,7 @@ export default mergeConfig(sharedConfig, {
test: {
name: getTestName(import.meta.url),
environment: 'browser',
setupFiles: [new URL('../../test/utils/setupPickers.js', import.meta.url).pathname],
setupFiles: [fileURLToPath(new URL('../../test/utils/setupPickers.js', import.meta.url))],
browser: {
enabled: true,
instances: [
Expand Down
3 changes: 2 additions & 1 deletion packages/x-date-pickers/vitest.config.jsdom.mts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { fileURLToPath } from 'node:url';
import { mergeConfig } from 'vitest/config';
// eslint-disable-next-line import/no-relative-packages
import { redirectImports } from '../../test/vite-plugin-filter-replace.mts';
Expand All @@ -24,6 +25,6 @@ export default mergeConfig(sharedConfig, {
test: {
name: getTestName(import.meta.url),
environment: 'jsdom',
setupFiles: [new URL('../../test/utils/setupPickers.js', import.meta.url).pathname],
setupFiles: [fileURLToPath(new URL('../../test/utils/setupPickers.js', import.meta.url))],
},
});
3 changes: 2 additions & 1 deletion packages/x-internal-gestures/vitest.config.browser.mts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/// <reference types="@vitest/browser/providers/playwright" />
import { fileURLToPath } from 'node:url';
import { mergeConfig } from 'vitest/config';
import sharedConfig from '../../vitest.shared.mts';
import { getTestName } from '../../scripts/getTestName.mts';
Expand All @@ -7,7 +8,7 @@ export default mergeConfig(sharedConfig, {
test: {
name: getTestName(import.meta.url),
environment: 'browser',
setupFiles: [new URL('./src/matchers/index.ts', import.meta.url).pathname],
setupFiles: [fileURLToPath(new URL('./src/matchers/index.ts', import.meta.url))],
browser: {
enabled: true,
isolate: true,
Expand Down
4 changes: 2 additions & 2 deletions vitest.shared.mts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export const alias = [
}),
{
find: 'test/utils',
replacement: new URL('./test/utils', import.meta.url).pathname,
replacement: fileURLToPath(new URL('./test/utils', import.meta.url)),
},
];

Expand All @@ -53,7 +53,7 @@ export default defineConfig({
},
test: {
globals: true,
setupFiles: [new URL('test/setupVitest.ts', import.meta.url).pathname],
setupFiles: [fileURLToPath(new URL('test/setupVitest.ts', import.meta.url))],
// Required for some tests that contain early returns or conditional tests.
passWithNoTests: true,
env: {
Expand Down