From cd3f9449875915a28f1e3bfdc433befa55fc74aa Mon Sep 17 00:00:00 2001 From: Tom Coleman Date: Wed, 14 Dec 2022 12:42:59 +1100 Subject: [PATCH 1/3] Make vite's bail function actually work --- code/lib/builder-vite/src/index.ts | 10 ++-------- ...orybook-builder-api-shutdown-server.ts.mdx | 19 ++++++++----------- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/code/lib/builder-vite/src/index.ts b/code/lib/builder-vite/src/index.ts index 8976a534072..b9535c4a5e0 100644 --- a/code/lib/builder-vite/src/index.ts +++ b/code/lib/builder-vite/src/index.ts @@ -69,14 +69,8 @@ function iframeMiddleware(options: ExtendedOptions, server: ViteDevServer): Requ let server: ViteDevServer; -export async function bail(e?: Error): Promise { - try { - return await server.close(); - } catch (err) { - console.warn('unable to close vite server'); - } - - throw e; +export async function bail(): Promise { + return server?.close(); } export const start: ViteBuilder['start'] = async ({ diff --git a/docs/snippets/common/storybook-builder-api-shutdown-server.ts.mdx b/docs/snippets/common/storybook-builder-api-shutdown-server.ts.mdx index 4c92faa541f..0e6d0e7c888 100644 --- a/docs/snippets/common/storybook-builder-api-shutdown-server.ts.mdx +++ b/docs/snippets/common/storybook-builder-api-shutdown-server.ts.mdx @@ -3,19 +3,16 @@ import { createViteServer } from './vite-server'; + +let server: ViteDevServer; +export async function bail(): Promise { + return await server.close(); +} + export const start: ViteBuilder['start'] = async ({ options, server: devServer }) => { // Remainder implementation goes here - - const server = await createViteServer(options as ExtendedOptions, devServer); - async function bail(e?: Error): Promise { - try { - return await server.close(); - } catch (err) { - console.warn('unable to close the server'); - } - throw e; - } - + server = await createViteServer(options as ExtendedOptions, devServer); + return { bail, totalTime: process.hrtime(startTime), From 120aa234138aabf7ccc6db8ebebb9e4a546274b6 Mon Sep 17 00:00:00 2001 From: Tom Coleman Date: Wed, 14 Dec 2022 12:45:33 +1100 Subject: [PATCH 2/3] Missed one thing --- .../common/storybook-builder-api-shutdown-server.ts.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/snippets/common/storybook-builder-api-shutdown-server.ts.mdx b/docs/snippets/common/storybook-builder-api-shutdown-server.ts.mdx index 0e6d0e7c888..8726c7fa204 100644 --- a/docs/snippets/common/storybook-builder-api-shutdown-server.ts.mdx +++ b/docs/snippets/common/storybook-builder-api-shutdown-server.ts.mdx @@ -6,7 +6,7 @@ import { createViteServer } from './vite-server'; let server: ViteDevServer; export async function bail(): Promise { - return await server.close(); + return await server?.close(); } export const start: ViteBuilder['start'] = async ({ options, server: devServer }) => { From f4043f1513e1826478fcd943de3aca8720097c92 Mon Sep 17 00:00:00 2001 From: Tom Coleman Date: Wed, 14 Dec 2022 22:22:58 +1100 Subject: [PATCH 3/3] Fix bad formatting --- .../common/storybook-builder-api-shutdown-server.ts.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/snippets/common/storybook-builder-api-shutdown-server.ts.mdx b/docs/snippets/common/storybook-builder-api-shutdown-server.ts.mdx index 8726c7fa204..429f8eff4e5 100644 --- a/docs/snippets/common/storybook-builder-api-shutdown-server.ts.mdx +++ b/docs/snippets/common/storybook-builder-api-shutdown-server.ts.mdx @@ -6,7 +6,7 @@ import { createViteServer } from './vite-server'; let server: ViteDevServer; export async function bail(): Promise { - return await server?.close(); + return server?.close(); } export const start: ViteBuilder['start'] = async ({ options, server: devServer }) => {