diff options
| author |  Bjorn Lu <bjornlu.dev@gmail.com>
| 2024-02-15 22:59:03 +0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2024-02-15 22:59:03 +0800 |
| commit | 1da9c5f2f3fe70b0206d1b3e0c01744fa40d511c (patch) | |
| tree | 0ff9835a25000763c56cd9dbed37411716baad0a | |
| parent | 1f598b372410066c6fcd41cba9915f6aaf7befa8 (diff) | |
| download | astro-1da9c5f2f3fe70b0206d1b3e0c01744fa40d511c.tar.gz astro-1da9c5f2f3fe70b0206d1b3e0c01744fa40d511c.tar.zst astro-1da9c5f2f3fe70b0206d1b3e0c01744fa40d511c.zip | |
Remove server-destroy dependency (#10132)
| -rw-r--r-- | .changeset/poor-llamas-chew.md | 5 | ||||
| -rw-r--r-- | packages/astro/package.json | 2 | ||||
| -rw-r--r-- | packages/astro/src/core/preview/static-preview-server.ts | 9 | ||||
| -rw-r--r-- | pnpm-lock.yaml | 6 |
4 files changed, 6 insertions, 16 deletions
diff --git a/.changeset/poor-llamas-chew.md b/.changeset/poor-llamas-chew.md new file mode 100644 index 000000000..695b78f0d --- /dev/null +++ b/.changeset/poor-llamas-chew.md @@ -0,0 +1,5 @@ +--- +"astro": patch +--- + +Simplifies internal Vite preview server teardown diff --git a/packages/astro/package.json b/packages/astro/package.json index 79bce5ef7..6fe67b2e0 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -166,7 +166,6 @@ "rehype": "^13.0.1", "resolve": "^1.22.4", "semver": "^7.5.4", - "server-destroy": "^1.0.1", "shikiji": "^0.9.19", "shikiji-core": "^0.9.19", "string-width": "^7.0.0", @@ -210,7 +209,6 @@ "@types/resolve": "^1.20.5", "@types/semver": "^7.5.2", "@types/send": "^0.17.4", - "@types/server-destroy": "^1.0.3", "@types/unist": "^3.0.2", "@types/yargs-parser": "^21.0.3", "astro-scripts": "workspace:*", diff --git a/packages/astro/src/core/preview/static-preview-server.ts b/packages/astro/src/core/preview/static-preview-server.ts index ba692611e..5eb28d450 100644 --- a/packages/astro/src/core/preview/static-preview-server.ts +++ b/packages/astro/src/core/preview/static-preview-server.ts @@ -1,7 +1,6 @@ import type http from 'node:http'; import { fileURLToPath } from 'node:url'; import { performance } from 'perf_hooks'; -import enableDestroy from 'server-destroy'; import { preview, type PreviewServer as VitePreviewServer } from 'vite'; import type { AstroSettings } from '../../@types/astro.js'; import type { Logger } from '../logger/core.js'; @@ -47,8 +46,6 @@ export default async function createStaticPreviewServer( throw err; } - enableDestroy(previewServer.httpServer); - // Log server start URLs logger.info( 'SKIP_FORMAT', @@ -73,10 +70,6 @@ export default async function createStaticPreviewServer( port: settings.config.server.port, closed, server: previewServer.httpServer as http.Server, - stop: async () => { - await new Promise((resolve, reject) => { - previewServer.httpServer.destroy((err) => (err ? reject(err) : resolve(undefined))); - }); - }, + stop: previewServer.close.bind(previewServer), }; } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 835fe2ee9..b264f122d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -650,9 +650,6 @@ importers: semver: specifier: ^7.5.4 version: 7.5.4 - server-destroy: - specifier: ^1.0.1 - version: 1.0.1 shikiji: specifier: ^0.9.19 version: 0.9.19 @@ -772,9 +769,6 @@ importers: '@types/send': specifier: ^0.17.4 version: 0.17.4 - '@types/server-destroy': - specifier: ^1.0.3 - version: 1.0.3 '@types/unist': specifier: ^3.0.2 version: 3.0.2 |