Skip to content

Commit deb5515

Browse files
authored
refactor!: remove non boolean middleware mode (#14792)
1 parent 17fb5ee commit deb5515

File tree

3 files changed

+5
-22
lines changed

3 files changed

+5
-22
lines changed

docs/guide/migration.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'))
150150
- Default exports of CSS files (e.g `import style from './foo.css'`): Use the `?inline` query instead
151151
- `import.meta.globEager`: Use `import.meta.glob('*', { eager: true })` instead
152152
- `ssr.format: 'cjs'` and `legacy.buildSsrCjsExternalHeuristics` ([#13816](https://github.com/vitejs/vite/discussions/13816))
153+
- `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))
153154

154155
## Advanced
155156

packages/vite/src/node/config.ts

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -670,8 +670,6 @@ export async function resolveConfig(
670670
const server = resolveServerOptions(resolvedRoot, config.server, logger)
671671
const ssr = resolveSSROptions(config.ssr, resolveOptions.preserveSymlinks)
672672

673-
const middlewareMode = config?.server?.middlewareMode
674-
675673
const optimizeDeps = config.optimizeDeps || {}
676674

677675
const BASE_URL = resolvedBase
@@ -796,7 +794,7 @@ export async function resolveConfig(
796794
},
797795
},
798796
worker: resolvedWorkerOptions,
799-
appType: config.appType ?? (middlewareMode === 'ssr' ? 'custom' : 'spa'),
797+
appType: config.appType ?? 'spa',
800798
experimental: {
801799
importGlobRestoreExtension: false,
802800
hmrPartialAccept: false,
@@ -824,24 +822,6 @@ export async function resolveConfig(
824822
.map((hook) => hook(resolved)),
825823
)
826824

827-
// validate config
828-
829-
if (middlewareMode === 'ssr') {
830-
logger.warn(
831-
colors.yellow(
832-
`Setting server.middlewareMode to 'ssr' is deprecated, set server.middlewareMode to \`true\`${
833-
config.appType === 'custom' ? '' : ` and appType to 'custom'`
834-
} instead`,
835-
),
836-
)
837-
} else if (middlewareMode === 'html') {
838-
logger.warn(
839-
colors.yellow(
840-
`Setting server.middlewareMode to 'html' is deprecated, set server.middlewareMode to \`true\` instead`,
841-
),
842-
)
843-
}
844-
845825
debug?.(`using resolved config: %O`, {
846826
...resolved,
847827
plugins: resolved.plugins.map((p) => p.name),
@@ -851,6 +831,8 @@ export async function resolveConfig(
851831
},
852832
})
853833

834+
// validate config
835+
854836
if (config.build?.terserOptions && config.build.minify !== 'terser') {
855837
logger.warn(
856838
colors.yellow(

packages/vite/src/node/server/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ export interface ServerOptions extends CommonServerOptions {
108108
* Create Vite dev server to be used as a middleware in an existing server
109109
* @default false
110110
*/
111-
middlewareMode?: boolean | 'html' | 'ssr'
111+
middlewareMode?: boolean
112112
/**
113113
* Options for files served via '/\@fs/'.
114114
*/

0 commit comments

Comments
 (0)