Merge pull request #26363 from storybookjs/fix/doctor-compat-check

CLI: Fix doctor compatibility check
storybookjs · Mar 7, 2024 · 247015e · 247015e
2 parents b400750 + 83303b1
commit 247015e
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/code/lib/cli/src/doctor/getIncompatibleStorybookPackages.ts b/code/lib/cli/src/doctor/getIncompatibleStorybookPackages.ts
@@ -19,12 +19,6 @@ type Context = {
   skipErrors?: boolean;
 };
 
-const isPackageIncompatible = (installedVersion: string, currentStorybookVersion: string) => {
-  const storybookVersion = semver.coerce(currentStorybookVersion);
-  const packageVersion = semver.coerce(installedVersion);
-  return storybookVersion?.major !== packageVersion?.major;
-};
-
 export const checkPackageCompatibility = async (dependency: string, context: Context) => {
   const { currentStorybookVersion, skipErrors, packageManager } = context;
   try {
@@ -46,12 +40,12 @@ export const checkPackageCompatibility = async (dependency: string, context: Con
       ...peerDependencies,
     })
       .filter(([dep]) => storybookCorePackages[dep as keyof typeof storybookCorePackages])
-      .find(([, version]) => {
+      .find(([_, versionRange]) => {
         // prevent issues with "tag" based versions e.g. "latest" or "next" instead of actual numbers
         return (
-          version &&
-          semver.validRange(version) &&
-          isPackageIncompatible(version, currentStorybookVersion)
+          versionRange &&
+          semver.validRange(versionRange) &&
+          !semver.satisfies(currentStorybookVersion, versionRange)
         );
       });