diff --git a/docs/guide/migration.md b/docs/guide/migration.md index 181415d3c92102..a1510c98ca9994 100644 --- a/docs/guide/migration.md +++ b/docs/guide/migration.md @@ -150,6 +150,7 @@ const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8')) - Default exports of CSS files (e.g `import style from './foo.css'`): Use the `?inline` query instead - `import.meta.globEager`: Use `import.meta.glob('*', { eager: true })` instead - `ssr.format: 'cjs'` and `legacy.buildSsrCjsExternalHeuristics` ([#13816](https://github.com/vitejs/vite/discussions/13816)) +- `server.middlewareMode: 'ssr'` and `server.middlewareMode: 'html'`: Use [`appType`](/config/shared-options.md#apptype) + [`server.middlewareMode: true`](/config/server-options.md#server-middlewaremode) instead ([#8452](https://github.com/vitejs/vite/pull/8452)) ## Advanced diff --git a/packages/vite/src/node/config.ts b/packages/vite/src/node/config.ts index e923e9c348ec10..207b949cc7e83c 100644 --- a/packages/vite/src/node/config.ts +++ b/packages/vite/src/node/config.ts @@ -670,8 +670,6 @@ export async function resolveConfig( const server = resolveServerOptions(resolvedRoot, config.server, logger) const ssr = resolveSSROptions(config.ssr, resolveOptions.preserveSymlinks) - const middlewareMode = config?.server?.middlewareMode - const optimizeDeps = config.optimizeDeps || {} const BASE_URL = resolvedBase @@ -796,7 +794,7 @@ export async function resolveConfig( }, }, worker: resolvedWorkerOptions, - appType: config.appType ?? (middlewareMode === 'ssr' ? 'custom' : 'spa'), + appType: config.appType ?? 'spa', experimental: { importGlobRestoreExtension: false, hmrPartialAccept: false, @@ -824,24 +822,6 @@ export async function resolveConfig( .map((hook) => hook(resolved)), ) - // validate config - - if (middlewareMode === 'ssr') { - logger.warn( - colors.yellow( - `Setting server.middlewareMode to 'ssr' is deprecated, set server.middlewareMode to \`true\`${ - config.appType === 'custom' ? '' : ` and appType to 'custom'` - } instead`, - ), - ) - } else if (middlewareMode === 'html') { - logger.warn( - colors.yellow( - `Setting server.middlewareMode to 'html' is deprecated, set server.middlewareMode to \`true\` instead`, - ), - ) - } - debug?.(`using resolved config: %O`, { ...resolved, plugins: resolved.plugins.map((p) => p.name), @@ -851,6 +831,8 @@ export async function resolveConfig( }, }) + // validate config + if (config.build?.terserOptions && config.build.minify !== 'terser') { logger.warn( colors.yellow( diff --git a/packages/vite/src/node/server/index.ts b/packages/vite/src/node/server/index.ts index 20dfdad6be6363..e58dc4d1e3ea47 100644 --- a/packages/vite/src/node/server/index.ts +++ b/packages/vite/src/node/server/index.ts @@ -108,7 +108,7 @@ export interface ServerOptions extends CommonServerOptions { * Create Vite dev server to be used as a middleware in an existing server * @default false */ - middlewareMode?: boolean | 'html' | 'ssr' + middlewareMode?: boolean /** * Options for files served via '/\@fs/'. */