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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

CLI: Fix vite config automigration to resolve from project root #26262

Merged
merged 3 commits into from Mar 4, 2024

Conversation

valentinpalkovic
Copy link
Contributor

@valentinpalkovic valentinpalkovic commented Feb 29, 2024

Closes #26260

What I did

I try to resolve and search for the vite.config.js starting from the project root instead of cwd during the vite-config-file automigration.

Additionally, the vite-config-file automigrations throws an error instead of showing a prompt. This was because the promptType wasn't defined and a run function was missing. I have improved the types for the Fix type.

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!

  1. Checkout https://github.com/mandarini/storybook-upgrade-latest-nx
  2. Checkout the README.md for detailed reproduction steps

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 pull request has been released as version 0.0.0-pr-26262-sha-bb8590c9. Try it out in a new sandbox by running npx storybook@0.0.0-pr-26262-sha-bb8590c9 sandbox or in an existing project with npx storybook@0.0.0-pr-26262-sha-bb8590c9 upgrade.

More information
Published version 0.0.0-pr-26262-sha-bb8590c9
Triggered by @valentinpalkovic
Repository storybookjs/storybook
Branch valentin/fix-vite-config-automigration
Commit bb8590c9
Datetime Mon Mar 4 07:30:07 UTC 2024 (1709537407)
Workflow run 8136961530

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=26262

@valentinpalkovic
Copy link
Contributor Author

@mandarini Could you check out the canary release of this PR? 0.0.0-pr-26262-sha-4d24ee07

@valentinpalkovic valentinpalkovic force-pushed the valentin/fix-vite-config-automigration branch from f1bafcb to 9492cb4 Compare March 1, 2024 14:31
@valentinpalkovic valentinpalkovic changed the title Resolve vite config from project root instead of cwd Automigration: Resolve vite config from project root instead of cwd Mar 4, 2024
@valentinpalkovic valentinpalkovic force-pushed the valentin/fix-vite-config-automigration branch from 9492cb4 to bb8590c Compare March 4, 2024 07:28
Comment on lines +42 to +56
type PromptType<ResultType = any, T = Prompt> =
| T
| ((result: ResultType) => Promise<Prompt> | Prompt);

export type Fix<ResultType = any> = (
| {
promptType?: PromptType<ResultType, 'auto'>;
run: (options: RunOptions<ResultType>) => Promise<void>;
}
| {
promptType: PromptType<ResultType, 'manual' | 'notification'>;
run?: never;
}
) &
BaseFix<ResultType>;
Copy link
Contributor

Choose a reason for hiding this comment

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

Nice!

@valentinpalkovic valentinpalkovic merged commit 8909a59 into next Mar 4, 2024
57 of 58 checks passed
@valentinpalkovic valentinpalkovic deleted the valentin/fix-vite-config-automigration branch March 4, 2024 08:46
@github-actions github-actions bot mentioned this pull request Mar 4, 2024
17 tasks
@shilman shilman changed the title Automigration: Resolve vite config from project root instead of cwd CLI: Fix vite config automigration to resolve from project root Mar 5, 2024
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.

[Bug]: v8 automigrate viteConfigFile failure
3 participants