Skip to content
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.

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

WIP: CSF factories #30197

Draft
wants to merge 166 commits into
base: next
Choose a base branch
from
Draft

WIP: CSF factories #30197

wants to merge 166 commits into from

Conversation

kasperpeulen
Copy link
Contributor

@kasperpeulen kasperpeulen commented Jan 6, 2025

Closes #30166

What I did

Checklist for Contributors

Testing

The changes in this PR are covered in the following automated tests:

  • stories
  • unit tests
  • integration tests
  • end-to-end tests

Manual testing

This section is mandatory for all contributions. If you believe no manual test is necessary, please state so explicitly. Thanks!

Documentation

  • Add or update documentation reflecting your changes
  • If you are deprecating/removing a feature, make sure to update
    MIGRATION.MD

Checklist for Maintainers

  • When this PR is ready for testing, make sure to add ci:normal, ci:merged or ci:daily GH label to it to run a specific set of sandboxes. The particular set of sandboxes can be found in code/lib/cli-storybook/src/sandbox-templates.ts

  • Make sure this PR contains one of the labels below:

    Available labels
    • bug: Internal changes that fixes incorrect behavior.
    • maintenance: User-facing maintenance tasks.
    • dependencies: Upgrading (sometimes downgrading) dependencies.
    • build: Internal-facing build tooling & test updates. Will not show up in release changelog.
    • cleanup: Minor cleanup style change. Will not show up in release changelog.
    • documentation: Documentation only changes. Will not show up in release changelog.
    • feature request: Introducing a new feature.
    • BREAKING CHANGE: Changes that break compatibility in some way with current major version.
    • other: Changes that don't fit in the above categories.

🦋 Canary release

This pull request has been released as version 0.0.0-pr-30197-sha-7e96e461. Try it out in a new sandbox by running npx storybook@0.0.0-pr-30197-sha-7e96e461 sandbox or in an existing project with npx storybook@0.0.0-pr-30197-sha-7e96e461 upgrade.

More information
Published version 0.0.0-pr-30197-sha-7e96e461
Triggered by @yannbf
Repository storybookjs/storybook
Branch kasper/csf-factories
Commit 7e96e461
Datetime Tue Feb 4 09:35:30 UTC 2025 (1738661730)
Workflow run 13132447691

To request a new release of this pull request, mention the @storybookjs/core team.

core team members can create a new canary release here or locally with gh workflow run --repo storybookjs/storybook canary-release-pr.yml --field pr=30197

name before after diff z %
createSize 0 B 0 B 0 B - -
generateSize 78 MB 78 MB 0 B 1.49 0%
initSize 131 MB 132 MB 925 kB 15.39 0.7%
diffSize 53 MB 54 MB 925 kB 26.72 1.7%
buildSize 7.17 MB 7.2 MB 31.1 kB 76.23 0.4%
buildSbAddonsSize 1.85 MB 1.85 MB 1.75 kB 16.52 0.1%
buildSbCommonSize 195 kB 195 kB 0 B - 0%
buildSbManagerSize 1.86 MB 1.86 MB 12 B 1.22 0%
buildSbPreviewSize 0 B 0 B 0 B - -
buildStaticSize 0 B 0 B 0 B - -
buildPrebuildSize 3.91 MB 3.91 MB 1.76 kB 17.13 0%
buildPreviewSize 3.26 MB 3.29 MB 29.3 kB 87.51 0.9%
testBuildSize 0 B 0 B 0 B - -
testBuildSbAddonsSize 0 B 0 B 0 B - -
testBuildSbCommonSize 0 B 0 B 0 B - -
testBuildSbManagerSize 0 B 0 B 0 B - -
testBuildSbPreviewSize 0 B 0 B 0 B - -
testBuildStaticSize 0 B 0 B 0 B - -
testBuildPrebuildSize 0 B 0 B 0 B - -
testBuildPreviewSize 0 B 0 B 0 B - -
name before after diff z %
createTime 7s 10.6s 3.5s -1.31 🔺33.4%
generateTime 17.8s 22.8s 5s 1.63 🔺21.9%
initTime 10.9s 13.4s 2.5s 0.13 18.7%
buildTime 7.8s 9.6s 1.8s 1.02 19.3%
testBuildTime 0ms 0ms 0ms - -
devPreviewResponsive 5.1s 13.7s 8.6s 5.06 🔺62.7%
devManagerResponsive 3.7s 9.4s 5.6s 4.97 🔺60%
devManagerHeaderVisible 783ms 1.8s 1s 8.19 🔺57.5%
devManagerIndexVisible 855ms 1.8s 1s 7.48 🔺54%
devStoryVisibleUncached 4s 9.4s 5.3s 6.87 🔺56.9%
devStoryVisible 856ms 1.9s 1.1s 8.24 🔺56.2%
devAutodocsVisible 697ms 1.9s 1.2s 9.12 🔺64%
devMDXVisible 760ms 1.7s 989ms 8.55 🔺56.5%
buildManagerHeaderVisible 754ms 2s 1.2s 4.27 🔺62.9%
buildManagerIndexVisible 865ms 2.1s 1.2s 3.98 🔺58.9%
buildStoryVisible 744ms 2s 1.2s 4.35 🔺62.9%
buildAutodocsVisible 590ms 1.5s 977ms 0.71 62.3%
buildMDXVisible 651ms 1.7s 1s 7.98 🔺61.8%

Greptile Summary

Based on the provided files and changes, here's a concise summary of the CSF factories pull request:

Introduces CSF (Component Story Format) factories to provide a more structured and type-safe way to define Storybook configurations and stories.

  • Added defineConfig and meta.story() pattern for type-safe story definitions in /code/renderers/react/src/preview.tsx
  • Modified processCSFFile to detect and handle CSF4 factory format via isCSFFactoryPreview flag
  • Added support for per-CSF-file project annotations that can override global settings
  • Updated test infrastructure to support factory pattern in Vitest transformer and portable stories
  • Added comprehensive test coverage for both traditional CSF and new factory approaches

The changes provide better type safety and structure while maintaining backward compatibility with existing CSF formats. The implementation appears solid but requires careful testing around project annotation overrides and factory pattern adoption.

@kasperpeulen kasperpeulen changed the title CSF factories WIP: CSF factories Jan 6, 2025
@kasperpeulen kasperpeulen marked this pull request as draft January 6, 2025 13:50
Copy link
Contributor

@greptile-apps greptile-apps bot left a comment

Choose a reason for hiding this comment

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

20 file(s) reviewed, 19 comment(s)
Edit PR Review Bot Settings | Greptile

Comment on lines 17 to 19
const [previewFileUrl, ...previewAnnotationURLs] = [...previewAnnotations, previewOrConfigFile]
.filter(Boolean)
.map((path) => processPreviewAnnotation(path, projectRoot));
Copy link
Contributor

Choose a reason for hiding this comment

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

logic: Destructuring could fail if previewAnnotations and previewOrConfigFile are both empty arrays after filtering. Add a check to handle this case.

Comment on lines 26 to 29
const preview = await import('${previewFileUrl}');
const csfFactoryPreview = Object.values(preview).find(module => {
return 'isCSFFactoryPreview' in module
});
Copy link
Contributor

Choose a reason for hiding this comment

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

logic: Object.values() and find() could return undefined. Need type checking and error handling for when no CSF factory preview is found.

const configs = await Promise.all([${previewAnnotationURLs
.map(
(previewAnnotation, index) =>
// Prefer the updated module from an HMR update, otherwise import the original module
`hmrPreviewAnnotationModules[${index}] ?? import('${previewAnnotation}')`
)
.join(',\n')}])
return composeConfigs(configs);
return composeConfigs([...configs, preview]);
Copy link
Contributor

Choose a reason for hiding this comment

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

logic: preview is used in composeConfigs even when csfFactoryPreview is found, which could cause conflicts. Should only include preview in non-factory case.

@@ -27,11 +27,12 @@ export const testStory = (
return async (context: TestContext & TaskContext & { story: ComposedStoryFn }) => {
const composedStory = composeStory(
story,
meta,
'isCSFFactory' in story ? (meta as any).annotations : meta,
Copy link
Contributor

Choose a reason for hiding this comment

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

style: Type casting to 'any' should be avoided. Consider creating proper type definitions for CSF factories to maintain type safety.

{ initialGlobals: (await getInitialGlobals?.()) ?? {} },
undefined,
exportName
);

if (composedStory === undefined || skipTags?.some((tag) => composedStory.tags.includes(tag))) {
Copy link
Contributor

Choose a reason for hiding this comment

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

logic: Optional chaining on skipTags is unnecessary since it's a required parameter

Comment on lines 182 to 190
const div = document.createElement('div');
document.body.appendChild(div);

await CSF3InputFieldFilled.run({ canvasElement: div });

const input = screen.getByTestId('input') as HTMLInputElement;
expect(input.value).toEqual('Hello world!');

document.body.removeChild(div);
Copy link
Contributor

Choose a reason for hiding this comment

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

style: Test cleanup could fail if test errors before removeChild. Consider using try/finally

import { Button } from './Button';

// eslint-disable-next-line storybook/default-exports
const config = defineConfig({ args: { children: 'TODO: THIS IS NOT WORKING YET' } });
Copy link
Contributor

Choose a reason for hiding this comment

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

logic: TODO comment indicates unfinished/broken functionality. This should be resolved before merging.

});

export const CSF2StoryWithParamsAndDecorator = meta.story({
render: (args: any) => {
Copy link
Contributor

Choose a reason for hiding this comment

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

style: Using any type here loses type safety. Consider using proper Button component prop types.

Comment on lines 31 to 33
readonly meta = <TComponent extends ComponentType<any>, TMetaArgs extends Args>(
meta: ComponentAnnotations<TRenderer, any> & { component: TComponent; args: TMetaArgs }
) => {
Copy link
Contributor

Choose a reason for hiding this comment

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

logic: The meta method accepts any for TRenderer annotations but then casts to TMetaArgs. This could lead to type safety issues. Consider constraining the any type.

public meta: Meta<TRenderer, TArgs>,
public config: PreviewConfig<TRenderer>
) {
Object.assign(this, annotations);
Copy link
Contributor

Choose a reason for hiding this comment

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

style: Using Object.assign to copy all properties from annotations could lead to property collisions with the class's own methods/properties. Consider explicit property copying instead.

Copy link

nx-cloud bot commented Jan 6, 2025

View your CI Pipeline Execution ↗ for commit 6e89d67.

Command Status Duration Result
nx run-many -t build --parallel=3 ✅ Succeeded 1m 53s View ↗

☁️ Nx Cloud last updated this comment at 2025-02-04 13:55:47 UTC

@storybook-pr-benchmarking
Copy link

storybook-pr-benchmarking bot commented Jan 6, 2025

Package Benchmarks

Commit: 6e89d67, ran on 4 February 2025 at 14:00:44 UTC

The following packages have significant changes to their size or dependencies:

@storybook/addon-a11y

Before After Difference
Dependency count 56 56 0
Self size 332 KB 444 KB 🚨 +112 KB 🚨
Dependency size 12.71 MB 12.70 MB 🎉 -10 KB 🎉
Bundle Size Analyzer Link Link

@storybook/addon-actions

Before After Difference
Dependency count 7 7 0
Self size 59 KB 65 KB 🚨 +6 KB 🚨
Dependency size 3.22 MB 3.22 MB 0 B
Bundle Size Analyzer Link Link

@storybook/addon-backgrounds

Before After Difference
Dependency count 4 4 0
Self size 27 KB 45 KB 🚨 +18 KB 🚨
Dependency size 99 KB 99 KB 0 B
Bundle Size Analyzer Link Link

@storybook/addon-docs

Before After Difference
Dependency count 17 17 0
Self size 2.26 MB 2.25 MB 🎉 -7 KB 🎉
Dependency size 7.92 MB 7.91 MB 🎉 -13 KB 🎉
Bundle Size Analyzer Link Link

@storybook/addon-essentials

Before After Difference
Dependency count 36 36 0
Self size 12 KB 18 KB 🚨 +6 KB 🚨
Dependency size 13.93 MB 13.99 MB 🚨 +57 KB 🚨
Bundle Size Analyzer Link Link

@storybook/addon-highlight

Before After Difference
Dependency count 1 1 0
Self size 9 KB 12 KB 🚨 +3 KB 🚨
Dependency size 5 KB 5 KB 0 B
Bundle Size Analyzer Link Link

@storybook/addon-interactions

Before After Difference
Dependency count 56 56 0
Self size 128 KB 129 KB 🚨 +2 KB 🚨
Dependency size 12.74 MB 12.72 MB 🎉 -13 KB 🎉
Bundle Size Analyzer Link Link

@storybook/addon-links

Before After Difference
Dependency count 4 4 0
Self size 19 KB 20 KB 🚨 +1 KB 🚨
Dependency size 284 KB 272 KB 🎉 -13 KB 🎉
Bundle Size Analyzer Link Link

@storybook/addon-measure

Before After Difference
Dependency count 2 2 0
Self size 32 KB 60 KB 🚨 +28 KB 🚨
Dependency size 20 KB 20 KB 0 B
Bundle Size Analyzer Link Link

@storybook/addon-outline

Before After Difference
Dependency count 2 2 0
Self size 23 KB 42 KB 🚨 +19 KB 🚨
Dependency size 32 KB 32 KB 0 B
Bundle Size Analyzer Link Link

@storybook/addon-storysource

Before After Difference
Dependency count 7 7 0
Self size 1.89 MB 1.89 MB 🚨 +1 KB 🚨
Dependency size 10.80 MB 10.79 MB 🎉 -13 KB 🎉
Bundle Size Analyzer Link Link

@storybook/experimental-addon-test

Before After Difference
Dependency count 60 60 0
Self size 831 KB 834 KB 🚨 +3 KB 🚨
Dependency size 14.19 MB 14.18 MB 🎉 -13 KB 🎉
Bundle Size Analyzer Link Link

@storybook/addon-viewport

Before After Difference
Dependency count 2 2 0
Self size 27 KB 30 KB 🚨 +4 KB 🚨
Dependency size 67 KB 67 KB 0 B
Bundle Size Analyzer Link Link

@storybook/core

Before After Difference
Dependency count 54 54 0
Self size 19.05 MB 19.10 MB 🚨 +53 KB 🚨
Dependency size 14.44 MB 14.43 MB 🎉 -13 KB 🎉
Bundle Size Analyzer Link Link

@storybook/experimental-nextjs-vite

Before After Difference
Dependency count 153 153 0
Self size 232 KB 235 KB 🚨 +3 KB 🚨
Dependency size 44.75 MB 45.54 MB 🚨 +791 KB 🚨
Bundle Size Analyzer Link Link

@storybook/html-vite

Before After Difference
Dependency count 15 15 0
Self size 5 KB 6 KB 🚨 +1 KB 🚨
Dependency size 1.91 MB 1.91 MB 🎉 -424 B 🎉
Bundle Size Analyzer Link Link

@storybook/html-webpack5

Before After Difference
Dependency count 247 247 0
Self size 6 KB 8 KB 🚨 +1 KB 🚨
Dependency size 31.71 MB 31.71 MB 🚨 +320 B 🚨
Bundle Size Analyzer Link Link

@storybook/nextjs

Before After Difference
Dependency count 592 592 0
Self size 472 KB 475 KB 🚨 +3 KB 🚨
Dependency size 83.45 MB 84.24 MB 🚨 +790 KB 🚨
Bundle Size Analyzer Link Link

@storybook/preact-webpack5

Before After Difference
Dependency count 245 245 0
Self size 6 KB 8 KB 🚨 +1 KB 🚨
Dependency size 31.28 MB 31.28 MB 🚨 +320 B 🚨
Bundle Size Analyzer Link Link

@storybook/react-native-web-vite

Before After Difference
Dependency count 137 137 0
Self size 43 KB 44 KB 🚨 +1 KB 🚨
Dependency size 19.91 MB 20.71 MB 🚨 +804 KB 🚨
Bundle Size Analyzer Link Link

@storybook/react-vite

Before After Difference
Dependency count 87 87 0
Self size 13 KB 15 KB 🚨 +2 KB 🚨
Dependency size 16.08 MB 16.88 MB 🚨 +802 KB 🚨
Bundle Size Analyzer Link Link

@storybook/react-webpack5

Before After Difference
Dependency count 323 323 0
Self size 6 KB 8 KB 🚨 +2 KB 🚨
Dependency size 42.50 MB 43.30 MB 🚨 +803 KB 🚨
Bundle Size Analyzer Link Link

@storybook/server-webpack5

Before After Difference
Dependency count 255 255 0
Self size 14 KB 15 KB 🚨 +1 KB 🚨
Dependency size 32.69 MB 32.68 MB 🎉 -12 KB 🎉
Bundle Size Analyzer Link Link

@storybook/svelte-webpack5

Before After Difference
Dependency count 310 310 0
Self size 6 KB 7 KB 🚨 +1 KB 🚨
Dependency size 39.28 MB 39.28 MB 🚨 +320 B 🚨
Bundle Size Analyzer Link Link

@storybook/vue3-webpack5

Before After Difference
Dependency count 495 495 0
Self size 6 KB 7 KB 🚨 +1 KB 🚨
Dependency size 55.69 MB 55.69 MB 🚨 +320 B 🚨
Bundle Size Analyzer Link Link

@storybook/web-components-vite

Before After Difference
Dependency count 16 16 0
Self size 5 KB 6 KB 🚨 +1 KB 🚨
Dependency size 1.94 MB 1.94 MB 🎉 -424 B 🎉
Bundle Size Analyzer Link Link

@storybook/web-components-webpack5

Before After Difference
Dependency count 245 245 0
Self size 5 KB 7 KB 🚨 +1 KB 🚨
Dependency size 31.33 MB 31.33 MB 🚨 +320 B 🚨
Bundle Size Analyzer Link Link

@storybook/blocks

Before After Difference
Dependency count 4 4 0
Self size 607 KB 607 KB 🚨 +18 B 🚨
Dependency size 1.53 MB 1.52 MB 🎉 -13 KB 🎉
Bundle Size Analyzer Link Link

storybook

Before After Difference
Dependency count 55 55 0
Self size 22 KB 23 KB 🚨 +380 B 🚨
Dependency size 33.50 MB 33.54 MB 🚨 +40 KB 🚨
Bundle Size Analyzer Link Link

sb

Before After Difference
Dependency count 56 56 0
Self size 1 KB 1 KB 0 B
Dependency size 33.52 MB 33.56 MB 🚨 +40 KB 🚨
Bundle Size Analyzer Link Link

@storybook/cli

Before After Difference
Dependency count 388 390 🚨 +2 🚨
Self size 503 KB 530 KB 🚨 +27 KB 🚨
Dependency size 75.37 MB 75.43 MB 🚨 +54 KB 🚨
Bundle Size Analyzer Link Link

@storybook/codemod

Before After Difference
Dependency count 277 277 0
Self size 617 KB 612 KB 🎉 -5 KB 🎉
Dependency size 65.45 MB 65.49 MB 🚨 +40 KB 🚨
Bundle Size Analyzer Link Link

create-storybook

Before After Difference
Dependency count 113 113 0
Self size 1.11 MB 1.11 MB 🚨 +463 B 🚨
Dependency size 42.63 MB 42.67 MB 🚨 +40 KB 🚨
Bundle Size Analyzer Link Link

@storybook/source-loader

Before After Difference
Dependency count 5 5 0
Self size 41 KB 41 KB 🚨 +18 B 🚨
Dependency size 10.75 MB 10.73 MB 🎉 -13 KB 🎉
Bundle Size Analyzer Link Link

@storybook/test

Before After Difference
Dependency count 53 53 0
Self size 1.82 MB 1.82 MB 🚨 +18 B 🚨
Dependency size 8.09 MB 8.08 MB 🎉 -13 KB 🎉
Bundle Size Analyzer Link Link

@storybook/preset-react-webpack

Before After Difference
Dependency count 191 191 0
Self size 24 KB 24 KB 0 B
Dependency size 33.56 MB 34.37 MB 🚨 +802 KB 🚨
Bundle Size Analyzer Link Link

@storybook/preset-server-webpack

Before After Difference
Dependency count 18 18 0
Self size 10 KB 10 KB 0 B
Dependency size 1.48 MB 1.47 MB 🎉 -13 KB 🎉
Bundle Size Analyzer Link Link

@storybook/react

Before After Difference
Dependency count 6 6 0
Self size 932 KB 1.73 MB 🚨 +802 KB 🚨
Dependency size 24 KB 24 KB 0 B
Bundle Size Analyzer Link Link

@storybook/server

Before After Difference
Dependency count 9 9 0
Self size 13 KB 13 KB 🚨 +18 B 🚨
Dependency size 974 KB 961 KB 🎉 -13 KB 🎉
Bundle Size Analyzer Link Link

@yannbf yannbf added ci:normal and removed ci:merged Run the CI jobs that normally run when merged. labels Jan 31, 2025
@yannbf yannbf added ci:merged Run the CI jobs that normally run when merged. and removed ci:normal labels Feb 3, 2025
yannbf and others added 6 commits February 4, 2025 10:34
…tory

UI: Support CSF factories when creating story files from UI
…r/base-factories

# Conflicts:
#	code/.storybook/storybook.setup.ts
#	code/renderers/react/template/stories/csf4.stories.tsx
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci: do not merge ci:merged Run the CI jobs that normally run when merged. feature request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Tracking] Typesafe CSF factories
3 participants