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

Support for @vitest/browser v2.1.2 and later in @storybook/experiment-addon-test/vitest-plugin #29407

Open
wants to merge 6 commits into
base: next
Choose a base branch
from

Conversation

strozw
Copy link

@strozw strozw commented Oct 19, 2024

Closes #

closes #29404

What I did

This PR has been corrected to address an error that occurs when importing @vitest/borwser/context when browser mode is not used in vitest v2.1.2 or later.

In @storybook/experiment-addon-test/vitest-plugin, change @vitest/browser/context in setViewport to dynamic import, so that when an error is thrown it is handled as { page: null } when an error is thrown, so that the same processing can be done as before.

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/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>

Greptile Summary

This PR modifies the Vitest plugin in Storybook's experimental addon-test to support @vitest/browser v2.1.2 and later versions.

@@ -82,7 +82,7 @@
"@types/babel__traverse@npm:*": "patch:@types/babel__traverse@npm%3A7.20.6#~/.yarn/patches/@types-babel__traverse-npm-7.20.6-fac4243243.patch",
"@types/babel__traverse@npm:^7.18.0": "patch:@types/babel__traverse@npm%3A7.20.6#~/.yarn/patches/@types-babel__traverse-npm-7.20.6-fac4243243.patch",
"@types/node": "^22.0.0",
"@vitest/expect@npm:2.0.5": "patch:@vitest/expect@npm%3A2.0.5#~/.yarn/patches/@vitest-expect-npm-2.0.5-8933466cce.patch",
"@vitest/expect@npm:2.1.3": "patch:@vitest/expect@npm%3A2.0.5#~/.yarn/patches/@vitest-expect-npm-2.0.5-8933466cce.patch",
Copy link
Contributor

Choose a reason for hiding this comment

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

Notice that this still points to a patched v2.0.5, that's probably not what we want. Either we should remove the patch (if we can because of the upgrade), or re-apply the patch to v2.1.3

Copy link
Author

Choose a reason for hiding this comment

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

Thanks for pointing that out, I had overlooked that about the patch 🤦‍♂️
As for updating the vitest related packages, as you pointed out separately, there was no need to update them, so we have reverted the commits that update them.

97f93b7

Comment on lines 87 to 89
"@vitest/browser": "^2.1.3",
"storybook": "workspace:^",
"vitest": "^2.0.0"
"vitest": "^2.1.3"
Copy link
Contributor

Choose a reason for hiding this comment

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

Are these peer deps changes necessary? Can't this change still work with Vitest 2.0.0 and onwards?

The only logic change I see in this PR is moving the import to be a dynamic import, and that's probably still compatible with vitest 2.0.0

Copy link
Author

Choose a reason for hiding this comment

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

As you say, these updates were unnecessary and I have reverted.

97f93b7

@strozw strozw marked this pull request as ready for review October 20, 2024 06:18
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.

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

code/addons/test/src/vitest-plugin/viewports.ts Outdated Show resolved Hide resolved
@strozw strozw requested a review from JReinhold October 20, 2024 06:19
@strozw strozw force-pushed the fix-vitest-plugin-for-vitest-browser-2.1.2-later branch from d21a734 to 0284687 Compare October 20, 2024 06:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants