Skip to content

Commit 99b0e67

Browse files
authoredJul 18, 2022
fix(dev): build.ssr is set during dev, fix #9134 (#9187)
1 parent c5f2dc7 commit 99b0e67

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed
 

‎packages/vite/src/node/optimizer/index.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ export async function optimizeDeps(
224224
): Promise<DepOptimizationMetadata> {
225225
const log = asCommand ? config.logger.info : debug
226226

227-
const ssr = !!config.build.ssr
227+
const ssr = config.command === 'build' && !!config.build.ssr
228228

229229
const cachedMetadata = loadCachedDepOptimizationMetadata(
230230
config,
@@ -446,7 +446,8 @@ export function depsLogString(qualifiedIds: string[]): string {
446446
export async function runOptimizeDeps(
447447
resolvedConfig: ResolvedConfig,
448448
depsInfo: Record<string, OptimizedDepInfo>,
449-
ssr: boolean = !!resolvedConfig.build.ssr
449+
ssr: boolean = resolvedConfig.command === 'build' &&
450+
!!resolvedConfig.build.ssr
450451
): Promise<DepOptimizationResult> {
451452
const isBuild = resolvedConfig.command === 'build'
452453
const config: ResolvedConfig = {
@@ -748,7 +749,7 @@ export function depsFromOptimizedDepInfo(
748749
export function getOptimizedDepPath(
749750
id: string,
750751
config: ResolvedConfig,
751-
ssr: boolean = !!config.build.ssr
752+
ssr: boolean
752753
): string {
753754
return normalizePath(
754755
path.resolve(getDepsCacheDir(config, ssr), flattenId(id) + '.js')

‎packages/vite/src/node/optimizer/optimizer.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ export async function initDepsOptimizer(
5555
server?: ViteDevServer
5656
): Promise<void> {
5757
// Non Dev SSR Optimizer
58-
const ssr = !!config.build.ssr
58+
const ssr = config.command === 'build' && !!config.build.ssr
5959
if (!getDepsOptimizer(config, ssr)) {
6060
await createDepsOptimizer(config, server)
6161
}
@@ -95,7 +95,7 @@ async function createDepsOptimizer(
9595
): Promise<void> {
9696
const { logger } = config
9797
const isBuild = config.command === 'build'
98-
const ssr = !!config.build.ssr // safe as Dev SSR don't use this optimizer
98+
const ssr = isBuild && !!config.build.ssr // safe as Dev SSR don't use this optimizer
9999

100100
const sessionTimestamp = Date.now().toString()
101101

‎packages/vite/src/node/plugins/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ export async function resolvePlugins(
8585
wasmFallbackPlugin(),
8686
definePlugin(config),
8787
cssPostPlugin(config),
88-
config.build.ssr ? ssrRequireHookPlugin(config) : null,
88+
isBuild && config.build.ssr ? ssrRequireHookPlugin(config) : null,
8989
isBuild && buildHtmlPlugin(config),
9090
workerImportMetaUrlPlugin(config),
9191
...buildPlugins.pre,

0 commit comments

Comments
 (0)
Please sign in to comment.