Skip to content

Addon Vitest: Simplify setup file handling #35081

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

Closed
JReinhold wants to merge 1 commit into from
Closed

Addon Vitest: Simplify setup file handling #35081

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
57 changes: 27 additions & 30 deletions code/addons/vitest/src/vitest-plugin/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,27 +319,10 @@ export const storybookTest = async (options?: UserOptions): Promise<Plugin[]> =>
finalOptions.includeStories = includeStories;
const projectId = oneWayHash(finalOptions.configDir);

const areProjectAnnotationRequired = await requiresProjectAnnotations(
nonMutableInputConfig.test,
finalOptions
);

const internalSetupFiles = [
'@storybook/addon-vitest/internal/setup-file',
areProjectAnnotationRequired &&
'@storybook/addon-vitest/internal/setup-file-with-project-annotations',
].filter(Boolean) as string[];

const baseConfig: Omit<ViteUserConfig, 'plugins'> = {
cacheDir: resolvePathInStorybookCache('sb-vitest', projectId),
test: {
expect: { requireAssertions: false },
setupFiles: [
...internalSetupFiles,
// if the existing setupFiles is a string, we have to include it otherwise we're overwriting it
typeof nonMutableInputConfig.test?.setupFiles === 'string' &&
nonMutableInputConfig.test?.setupFiles,
].filter(Boolean) as string[],

...(finalOptions.storybookScript
? {
Expand Down Expand Up @@ -462,22 +445,36 @@ export const storybookTest = async (options?: UserOptions): Promise<Plugin[]> =>
return config;
},
async configureVitest(context) {
context.vitest.config.coverage.exclude.push('storybook-static');
const { config: projectConfig } = context.project;

projectConfig.coverage.exclude.push('storybook-static');

const isBrowserModeEnabled = context.vitest.config.browser?.enabled === true;
const areProjectAnnotationsRequired = await requiresProjectAnnotations(
projectConfig,
finalOptions
);

const internalSetupFileIds = [
projectConfig.browser?.enabled === true &&
(context.vitest.version.startsWith('3')
? '@storybook/addon-vitest/internal/setup-file.browser.3'
: '@storybook/addon-vitest/internal/setup-file.browser.4'),
'@storybook/addon-vitest/internal/setup-file',
areProjectAnnotationsRequired &&
'@storybook/addon-vitest/internal/setup-file-with-project-annotations',
].filter(Boolean) as string[];

if (isBrowserModeEnabled) {
const setupFilePath = context.vitest.version.startsWith('3')
? '@storybook/addon-vitest/internal/setup-file.browser.3'
: '@storybook/addon-vitest/internal/setup-file.browser.4';
const internalSetupFiles = internalSetupFileIds.map((setupFileId) =>
fileURLToPath(import.meta.resolve(setupFileId))
);

context.vitest.config.setupFiles = [
setupFilePath,
...(context.vitest.config.setupFiles ?? []).filter(
(configuredSetupFile) => configuredSetupFile !== setupFilePath
),
];
}
projectConfig.setupFiles = [
...internalSetupFiles,
...(projectConfig.setupFiles ?? []).filter(
(setupFile) =>
!internalSetupFiles.includes(setupFile) && !internalSetupFileIds.includes(setupFile)
),
];

// NOTE: we start telemetry immediately but do not wait on it. Typically it should complete
// before the tests do. If not we may miss the event, we are OK with that.
Expand Down
Loading