diff options
| author |  Bjorn Lu <bjornlu.dev@gmail.com>
| 2022-08-29 23:11:18 +0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2022-08-29 23:11:18 +0800 |
| commit | 2d2e38e473166e1e79886d3a9c7854927995dda1 (patch) | |
| tree | caabccce634d006bbb021436926f4899111fdeab | |
| parent | ca28d7578b7168fbc407132dc9a0c4115e1be878 (diff) | |
| download | astro-2d2e38e473166e1e79886d3a9c7854927995dda1.tar.gz astro-2d2e38e473166e1e79886d3a9c7854927995dda1.tar.zst astro-2d2e38e473166e1e79886d3a9c7854927995dda1.zip | |
Remove hardcoded Vite middleware handling (#4531)
| -rw-r--r-- | .changeset/fuzzy-frogs-try.md | 5 | ||||
| -rw-r--r-- | packages/astro/src/core/build/index.ts | 1 | ||||
| -rw-r--r-- | packages/astro/src/core/create-vite.ts | 1 | ||||
| -rw-r--r-- | packages/astro/src/vite-plugin-astro-server/index.ts | 16 |
4 files changed, 6 insertions, 17 deletions
diff --git a/.changeset/fuzzy-frogs-try.md b/.changeset/fuzzy-frogs-try.md new file mode 100644 index 000000000..4004779e6 --- /dev/null +++ b/.changeset/fuzzy-frogs-try.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Remove hardcoded Vite middleware handling diff --git a/packages/astro/src/core/build/index.ts b/packages/astro/src/core/build/index.ts index aa823fef2..829637ddd 100644 --- a/packages/astro/src/core/build/index.ts +++ b/packages/astro/src/core/build/index.ts @@ -72,7 +72,6 @@ class AstroBuilder { hmr: false, middlewareMode: true, }, - appType: 'custom', }, { astroConfig: this.config, logging, mode: 'build' } ); diff --git a/packages/astro/src/core/create-vite.ts b/packages/astro/src/core/create-vite.ts index e981d983d..81ac43721 100644 --- a/packages/astro/src/core/create-vite.ts +++ b/packages/astro/src/core/create-vite.ts @@ -65,6 +65,7 @@ export async function createVite( cacheDir: fileURLToPath(new URL('./node_modules/.vite/', astroConfig.root)), // using local caches allows Astro to be used in monorepos, etc. clearScreen: false, // we want to control the output, not Vite logLevel: 'warn', // log warnings and errors only + appType: 'custom', optimizeDeps: { entries: ['src/**/*'], exclude: ['node-fetch'], diff --git a/packages/astro/src/vite-plugin-astro-server/index.ts b/packages/astro/src/vite-plugin-astro-server/index.ts index 4b8b9dd88..525ec0a86 100644 --- a/packages/astro/src/vite-plugin-astro-server/index.ts +++ b/packages/astro/src/vite-plugin-astro-server/index.ts @@ -28,20 +28,6 @@ interface AstroPluginOptions { logging: LogOptions; } -const BAD_VITE_MIDDLEWARE = [ - 'viteIndexHtmlMiddleware', - 'vite404Middleware', - 'viteSpaFallbackMiddleware', -]; -function removeViteHttpMiddleware(server: vite.Connect.Server) { - for (let i = server.stack.length - 1; i > 0; i--) { - // @ts-expect-error using internals until https://github.com/vitejs/vite/pull/4640 is merged - if (BAD_VITE_MIDDLEWARE.includes(server.stack[i].handle.name)) { - server.stack.splice(i, 1); - } - } -} - function truncateString(str: string, n: number) { if (str.length > n) { return str.substring(0, n) + '…'; @@ -386,8 +372,6 @@ export default function createPlugin({ config, logging }: AstroPluginOptions): v viteServer.watcher.on('unlink', rebuildManifest.bind(null, true)); viteServer.watcher.on('change', rebuildManifest.bind(null, false)); return () => { - removeViteHttpMiddleware(viteServer.middlewares); - // Push this middleware to the front of the stack so that it can intercept responses. if (config.base !== '/') { viteServer.middlewares.stack.unshift({ |