Merge branch 'main' into codacy-fixes

chromaui · Mar 13, 2024 · 3f49d13 · 3f49d13
2 parents 2332ecb + 419e60d
commit 3f49d13
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/node-src/tasks/upload.ts b/node-src/tasks/upload.ts
@@ -31,6 +31,7 @@ import { uploadBuild } from '../lib/upload';
 import { getFileHashes } from '../lib/getFileHashes';
 import { waitForSentinel } from '../lib/waitForSentinel';
 import { checkStorybookBaseDir } from '../lib/checkStorybookBaseDir';
+import semver from 'semver';
 
 interface PathSpec {
   pathname: string;
@@ -108,8 +109,12 @@ export const traceChangedFiles = async (ctx: Context, task: Task) => {
   if (!ctx.turboSnap || ctx.turboSnap.unavailable) return;
   if (!ctx.git.changedFiles) return;
   if (!ctx.fileInfo.statsPath) {
+    // If we don't know the SB version, we should assume we don't support `--stats-json`
+    const nonLegacyStatsSupported =
+      ctx.storybook?.version && semver.gte(semver.coerce(ctx.storybook.version), '8.0.0');
+
     ctx.turboSnap.bailReason = { missingStatsFile: true };
-    throw new Error(missingStatsFile());
+    throw new Error(missingStatsFile({ legacy: !nonLegacyStatsSupported }));
   }
 
   transitionTo(tracing)(ctx, task);

diff --git a/node-src/ui/messages/errors/missingStatsFile.stories.ts b/node-src/ui/messages/errors/missingStatsFile.stories.ts
@@ -4,4 +4,6 @@ export default {
   title: 'CLI/Messages/Errors',
 };
 
-export const MissingStatsFile = () => missingStatsFile();
+export const MissingStatsFile = () => missingStatsFile({ legacy: false });
+
+export const MissingStatsFileLegacy = () => missingStatsFile({ legacy: true });
diff --git a/node-src/ui/messages/errors/missingStatsFile.ts b/node-src/ui/messages/errors/missingStatsFile.ts
@@ -3,9 +3,11 @@ import { dedent } from 'ts-dedent';
 
 import { error } from '../../components/icons';
 
-export default () =>
+export default ({ legacy }: { legacy: boolean }) =>
   dedent(chalk`
     ${error} {bold TurboSnap disabled due to missing stats file}
     Did not find {bold preview-stats.json} in your built Storybook.
-    Make sure you pass {bold --webpack-stats-json} when building your Storybook.
+    Make sure you pass {bold ${
+      legacy ? `--webpack-stats-json` : `--stats-json`
+    }} when building your Storybook.
   `);