The UpgradeStorybookToSameVersionError is too flaky, so only logging …

…it for now and continue the upgrade as normal
storybookjs · May 21, 2024 · 7bff9d1 · 7bff9d1
1 parent 84fa690
commit 7bff9d1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/code/lib/cli/src/upgrade.ts b/code/lib/cli/src/upgrade.ts
@@ -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 }));
   }
 
   const [latestVersion, packageJson] = await Promise.all([

diff --git a/code/lib/core-events/src/errors/server-errors.ts b/code/lib/core-events/src/errors/server-errors.ts
@@ -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.