Cancel upload as well and fix tests

chromaui · Sep 20, 2023 · fa3a277 · fa3a277
1 parent b4b33fb
commit fa3a277
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/node-src/runBuild.ts b/node-src/runBuild.ts
@@ -66,7 +66,7 @@ export async function runBuild(ctx: Context) {
         setExitCode(ctx, exitCodes.BUILD_NO_STORIES);
         throw rewriteErrorMessage(err, missingStories(ctx));
       }
-      if (ctx.extraOptions.experimental_abortSignal?.aborted) {
+      if (ctx.options.experimental_abortSignal?.aborted) {
         setExitCode(ctx, exitCodes.BUILD_WAS_CANCELED, true);
         throw rewriteErrorMessage(err, buildCanceled());
       }

diff --git a/node-src/tasks/build.test.ts b/node-src/tasks/build.test.ts
@@ -129,6 +129,7 @@ describe('buildStorybook', () => {
       spawnParams: { command: 'npm run build:storybook --script-args' },
       env: { STORYBOOK_BUILD_TIMEOUT: 1000 },
       log: { debug: jest.fn() },
+      options: {},
     } as any;
     await buildStorybook(ctx);
     expect(ctx.buildLogFile).toMatch(/build-storybook\.log$/);

diff --git a/node-src/tasks/build.ts b/node-src/tasks/build.ts
@@ -69,7 +69,7 @@ export const buildStorybook = async (ctx: Context) => {
     logFile.on('error', reject);
   });
 
-  const { experimental_abortSignal: abortSignal } = ctx.extraOptions;
+  const { experimental_abortSignal: abortSignal } = ctx.options;
 
   try {
     const { command } = ctx.spawnParams;

diff --git a/node-src/tasks/upload.ts b/node-src/tasks/upload.ts
@@ -288,6 +288,7 @@ export const uploadStorybook = async (ctx: Context, task: Task) => {
       const percentage = Math.round((progress / total) * 100);
       task.output = uploading({ percentage }).output;
 
+      ctx.options.experimental_abortSignal?.throwIfAborted();
       ctx.options.experimental_onTaskProgress?.({ ...ctx }, { progress, total, unit: 'bytes' });
     },
     // Avoid spamming the logs with progress updates in non-interactive mode