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.

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

Jump to bottom

CLI: Log UpgradeStorybookToSameVersionError but continue upgrade as normal #27217

Merged
merged 6 commits into from
Jun 5, 2024
Merged

CLI: Log UpgradeStorybookToSameVersionError but continue upgrade as normal #27217

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7bff9d1
The UpgradeStorybookToSameVersionError is too flaky, so only logging …
kasperpeulen May 21, 2024
ff1f2f4
Merge branch 'next' into kasper/disable-upgrade-to-same-version-error
valentinpalkovic May 22, 2024
260583a
Merge branch 'next' into kasper/disable-upgrade-to-same-version-error
valentinpalkovic May 27, 2024
6bbc3b9
Merge branch 'next' into kasper/disable-upgrade-to-same-version-error
valentinpalkovic May 31, 2024
51fcb1b
Update logger to warn instead of error for same version upgrade error
valentinpalkovic May 31, 2024
394b984
Adjust spec
kasperpeulen Jun 4, 2024
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
4 changes: 3 additions & 1 deletion code/lib/cli/src/upgrade.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,10 @@ export const doUpgrade = async ({
if (!isCanary && lt(currentVersion, beforeVersion)) {
throw new UpgradeStorybookToLowerVersionError({ beforeVersion, currentVersion });
}

if (!isCanary && eq(currentVersion, beforeVersion)) {
throw new UpgradeStorybookToSameVersionError({ beforeVersion });
// Not throwing, as the beforeVersion calculation doesn't always work in monorepos.
logger.error(new UpgradeStorybookToSameVersionError({ beforeVersion }));
valentinpalkovic marked this conversation as resolved.
Show resolved Hide resolved
}

const [latestVersion, packageJson] = await Promise.all([
Expand Down
2 changes: 1 addition & 1 deletion code/lib/core-events/src/errors/server-errors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,7 @@ export class UpgradeStorybookToSameVersionError extends StorybookError {

template() {
return dedent`
You are trying to upgrade Storybook to the same version that is currently installed in the project, version ${this.data.beforeVersion}. This is not supported.
You are upgrading Storybook to the same version that is currently installed in the project, version ${this.data.beforeVersion}.

This usually happens when running the upgrade command without a version specifier, e.g. "npx storybook upgrade".
This will cause npm to run the globally cached storybook binary, which might be the same version that you already have.
Expand Down
Loading