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

CLI: Enhance csf factory codemod to migrate from csf2 #30395

Merged

Conversation

yannbf
Copy link
Member

@yannbf yannbf commented Jan 27, 2025

Closes #

What I did

This PR introduces a brief refactor in the csf2-to-3 codemod so it can be reused as part of the csf-factories codemod.

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 PR does not have a canary release associated. You can request a canary release of this pull request by mentioning the @storybookjs/core team here.

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

name before after diff z %
createSize 0 B 0 B 0 B - -
generateSize 77.9 MB 77.9 MB 24.1 kB 2.24 0%
initSize 132 MB 132 MB 24.1 kB -0.58 0%
diffSize 53.8 MB 53.8 MB 0 B -0.64 0%
buildSize 7.19 MB 7.19 MB 0 B 1.47 0%
buildSbAddonsSize 1.85 MB 1.85 MB 0 B 0.08 0%
buildSbCommonSize 195 kB 195 kB 0 B - 0%
buildSbManagerSize 1.87 MB 1.87 MB 0 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 0 B 1.42 0%
buildPreviewSize 3.28 MB 3.28 MB 0 B 1.57 0%
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 8.7s 20.1s 11.3s 0.4 56.4%
generateTime 20s 20.4s 362ms -0.33 1.8%
initTime 12.8s 15.2s 2.4s 0.66 16%
buildTime 8.9s 9.2s 312ms -0.43 3.4%
testBuildTime 0ms 0ms 0ms - -
devPreviewResponsive 5.3s 5.4s 126ms 0.99 2.3%
devManagerResponsive 3.6s 3.9s 312ms 0.8 7.9%
devManagerHeaderVisible 697ms 780ms 83ms 2.63 🔺10.6%
devManagerIndexVisible 735ms 805ms 70ms 2.3 🔺8.7%
devStoryVisibleUncached 2s 2.1s 86ms 1.33 4%
devStoryVisible 734ms 803ms 69ms 2.36 🔺8.6%
devAutodocsVisible 506ms 691ms 185ms 2.73 🔺26.8%
devMDXVisible 524ms 590ms 66ms 0.83 11.2%
buildManagerHeaderVisible 520ms 650ms 130ms 1.05 20%
buildManagerIndexVisible 523ms 653ms 130ms 1 19.9%
buildStoryVisible 513ms 636ms 123ms 1 19.3%
buildAutodocsVisible 426ms 559ms 133ms 1.88 🔺23.8%
buildMDXVisible 420ms 565ms 145ms 1.3 🔺25.7%

Greptile Summary

Refactored the csf-2-to-3 codemod to enable reuse in the csf-factories transformation, focusing on modular code structure and improved TypeScript support.

  • Extracted core transformation logic into standalone csf2to3 function in code/lib/codemod/src/transforms/csf-2-to-3.ts
  • Added comprehensive TypeScript support for meta declarations and story definitions in code/lib/cli-storybook/src/codemod/helpers/story-to-csf-factory.ts
  • Enhanced handling of type annotations, 'satisfies' expressions, and 'as' expressions for better TypeScript integration
  • Updated test coverage to verify transformations for both JavaScript and TypeScript story formats

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.

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

Comment on lines 308 to 309
// Do change the type of no-arg stories without annotations to StoryFn when applicable
if (isSimpleCSFStory(init, 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: Duplicate comment line should be removed


export default { title: 'Component', Component: Cat };

const Template: Story = (args) => <Button {...args} />
Copy link
Contributor

Choose a reason for hiding this comment

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

logic: Template uses Button component but args are typed for Cat component. This could cause type errors.

Comment on lines 166 to +164
// This is a tough one to support, we just skip for now.
// Relates to `Stories.Story.args` where Stories is coming from another file. We can't know whether it should be transformed or not.
if (err.message.includes(`instead got "MemberExpression"`)) {
console.log({ path });
return;
Copy link
Contributor

Choose a reason for hiding this comment

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

style: silently returning on MemberExpression errors could hide issues. Consider adding a debug log here to help track these cases.

import { Story, StoryFn, ComponentStory, ComponentStoryObj } from '@storybook/react';
import { Cat, type CatProps } from './Cat';

export default { title: 'Component', Component: Cat };
Copy link
Contributor

Choose a reason for hiding this comment

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

style: Property name 'Component' (uppercase) in the meta object doesn't match the standard 'component' (lowercase) used elsewhere

Copy link

nx-cloud bot commented Jan 27, 2025

View your CI Pipeline Execution ↗ for commit 488fd4f.

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

☁️ Nx Cloud last updated this comment at 2025-01-28 11:08:19 UTC

@storybook-pr-benchmarking
Copy link

storybook-pr-benchmarking bot commented Jan 27, 2025

Package Benchmarks

Commit: 488fd4f, ran on 28 January 2025 at 11:13:08 UTC

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

@storybook/cli

Before After Difference
Dependency count 401 390 🎉 -11 🎉
Self size 529 KB 530 KB 🚨 +468 B 🚨
Dependency size 75.62 MB 75.35 MB 🎉 -271 KB 🎉
Bundle Size Analyzer Link Link

@yannbf yannbf force-pushed the yann/csf-factory-codemod-from-csf-2 branch from e666dd4 to 488fd4f Compare January 28, 2025 11:03
@kasperpeulen kasperpeulen merged commit ab9329e into kasper/csf-factories Jan 28, 2025
56 of 57 checks passed
@kasperpeulen kasperpeulen deleted the yann/csf-factory-codemod-from-csf-2 branch January 28, 2025 13:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants