Skip to content

Commit 241a250

Browse files
fix: dev server improvements (#4706)
1 parent 12a30c5 commit 241a250

File tree

2 files changed

+5
-27
lines changed

2 files changed

+5
-27
lines changed

packages/start-plugin-core/src/dev-server-plugin/plugin.ts

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { createEvent, getHeader, sendWebResponse } from 'h3'
22
import { isRunnableDevEnvironment } from 'vite'
33
import { VITE_ENVIRONMENT_NAMES } from '../constants'
44
import { extractHtmlScripts } from './extract-html-scripts'
5-
import type { Connect, DevEnvironment, Plugin, ViteDevServer } from 'vite'
5+
import type { Connect, DevEnvironment, Plugin } from 'vite'
66

77
/* eslint-disable no-var */
88
declare global {
@@ -18,6 +18,9 @@ export function devServerPlugin(): Plugin {
1818
config(userConfig, { mode }) {
1919
// config = userConfig
2020
isTest = isTest ? isTest : mode === 'test'
21+
// see https://vite.dev/config/shared-options.html#apptype
22+
// this will prevent vite from injecting middlewares that we don't want
23+
userConfig.appType = 'custom'
2124
},
2225
configureServer(viteDevServer) {
2326
if (isTest) {
@@ -27,8 +30,6 @@ export function devServerPlugin(): Plugin {
2730
// upon server restart, reset the injected scripts
2831
globalThis.TSS_INJECTED_HEAD_SCRIPTS = undefined
2932
return () => {
30-
remove_html_middlewares(viteDevServer.middlewares)
31-
3233
viteDevServer.middlewares.use(async (req, res, next) => {
3334
// Create an H3Event to have it passed into the server entry
3435
// i.e: event => defineEventHandler(event)
@@ -142,29 +143,6 @@ export function devServerPlugin(): Plugin {
142143
}
143144
}
144145

145-
/**
146-
* Removes Vite internal middleware
147-
*
148-
* @param server
149-
*/
150-
function remove_html_middlewares(server: ViteDevServer['middlewares']) {
151-
const html_middlewares = [
152-
'viteIndexHtmlMiddleware',
153-
'vite404Middleware',
154-
'viteSpaFallbackMiddleware',
155-
]
156-
for (let i = server.stack.length - 1; i > 0; i--) {
157-
if (
158-
html_middlewares.includes(
159-
// @ts-expect-error
160-
server.stack[i].handle.name,
161-
)
162-
) {
163-
server.stack.splice(i, 1)
164-
}
165-
}
166-
}
167-
168146
/**
169147
* Formats error for SSR message in error overlay
170148
* @param req

packages/start-plugin-core/src/plugin.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ export function TanStackStartVitePluginCore(
189189
{
190190
name: 'tanstack-start:core:capture-client-bundle',
191191
applyToEnvironment(e) {
192-
return e.config.consumer === 'client'
192+
return e.name === VITE_ENVIRONMENT_NAMES.client
193193
},
194194
enforce: 'post',
195195
generateBundle(_options, bundle) {

0 commit comments

Comments
 (0)