Merge pull request #13294 from storybookjs/13292-manager-time-label

CLI: Fix not printing managerTotalTime when using cached manager
storybookjs · Nov 26, 2020 · 9c35dcd · 9c35dcd
2 parents dcbe782 + 48437b7
commit 9c35dcd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/lib/core/src/server/build-dev.ts b/lib/core/src/server/build-dev.ts
@@ -153,8 +153,8 @@ function outputStartupInformation(options: {
   version: string;
   address: string;
   networkAddress: string;
-  managerTotalTime: [number, number];
-  previewTotalTime: [number, number];
+  managerTotalTime?: [number, number];
+  previewTotalTime?: [number, number];
 }) {
   const {
     updateInfo,
@@ -283,10 +283,9 @@ export async function buildDevStandalone(
 
     if (options.smokeTest) {
       await outputStats(previewStats, managerStats);
-      const managerWarnings = (managerStats as any).toJson().warnings.length > 0;
-      const previewWarnings =
-        !options.ignorePreview && (previewStats as any).toJson().warnings.length > 0;
-      process.exit(managerWarnings || previewWarnings ? 1 : 0);
+      const hasManagerWarnings = managerStats && managerStats.toJson().warnings.length > 0;
+      const hasPreviewWarnings = previewStats && previewStats.toJson().warnings.length > 0;
+      process.exit(hasManagerWarnings || (hasPreviewWarnings && !options.ignorePreview) ? 1 : 0);
       return;
     }
 

diff --git a/lib/core/src/server/dev-server.ts b/lib/core/src/server/dev-server.ts
@@ -258,7 +258,7 @@ const startManager = async ({
   }
 
   if (!managerConfig) {
-    return { managerStats: null, managerTotalTime: [0, 0] } as ManagerResult;
+    return {};
   }
 
   const compiler = webpack(managerConfig);
@@ -312,7 +312,7 @@ const startPreview = async ({
   outputDir,
 }: any): Promise<PreviewResult> => {
   if (options.ignorePreview) {
-    return { previewStats: null, previewTotalTime: [0, 0] } as PreviewResult;
+    return {};
   }
 
   const previewConfig = await loadConfig({

diff --git a/lib/core/src/server/types.ts b/lib/core/src/server/types.ts
@@ -94,13 +94,13 @@ export interface ReleaseNotesData {
 }
 
 export interface PreviewResult {
-  previewStats: Stats;
-  previewTotalTime: [number, number];
+  previewStats?: Stats;
+  previewTotalTime?: [number, number];
 }
 
 export interface ManagerResult {
-  managerStats: Stats;
-  managerTotalTime: [number, number];
+  managerStats?: Stats;
+  managerTotalTime?: [number, number];
 }
 
 // TODO: this is a generic interface that we can share across multiple SB packages (like @storybook/cli)