From 5b49187a8d351a795bd661930d97cca61cb5ab6f Mon Sep 17 00:00:00 2001 From: yoho Date: Thu, 21 Jul 2022 09:50:20 +0800 Subject: [PATCH 1/5] fix: config --- packages/vite/src/node/config.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/vite/src/node/config.ts b/packages/vite/src/node/config.ts index 4716bc6fa11271..16535b99bb2e4d 100644 --- a/packages/vite/src/node/config.ts +++ b/packages/vite/src/node/config.ts @@ -703,6 +703,8 @@ export async function resolveConfig( ) const workerResolved: ResolvedConfig = Object.assign( + {}, + config, workerConfig, resolvedConfig, { From 8494ae42bb540bfe323f49f58a2ce80c786d757e Mon Sep 17 00:00:00 2001 From: yoho Date: Thu, 21 Jul 2022 10:19:06 +0800 Subject: [PATCH 2/5] fix: warn --- packages/vite/src/node/config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vite/src/node/config.ts b/packages/vite/src/node/config.ts index 16535b99bb2e4d..525261f8ecb13c 100644 --- a/packages/vite/src/node/config.ts +++ b/packages/vite/src/node/config.ts @@ -663,7 +663,7 @@ export async function resolveConfig( ...config.experimental } } - const resolved: ResolvedConfig = Object.assign(config, resolvedConfig) + const resolved: ResolvedConfig = Object.assign({}, config, resolvedConfig) if (middlewareMode === 'ssr') { logger.warn( From b673cb9401b1aa5bc6fa7fb4242a09e42c426065 Mon Sep 17 00:00:00 2001 From: yoho Date: Thu, 21 Jul 2022 11:13:02 +0800 Subject: [PATCH 3/5] fix: config --- packages/vite/src/node/config.ts | 68 +++++++++++++++++--------------- 1 file changed, 36 insertions(+), 32 deletions(-) diff --git a/packages/vite/src/node/config.ts b/packages/vite/src/node/config.ts index 525261f8ecb13c..135b3202aeb2b9 100644 --- a/packages/vite/src/node/config.ts +++ b/packages/vite/src/node/config.ts @@ -412,25 +412,6 @@ export async function resolveConfig( } }) - let workerConfig = mergeConfig({}, config) - const [workerPrePlugins, workerNormalPlugins, workerPostPlugins] = - sortUserPlugins(rawWorkerUserPlugins) - - // run config hooks - const workerUserPlugins = [ - ...workerPrePlugins, - ...workerNormalPlugins, - ...workerPostPlugins - ] - for (const p of workerUserPlugins) { - if (p.config) { - const res = await p.config(workerConfig, configEnv) - if (res) { - workerConfig = mergeConfig(workerConfig, res) - } - } - } - // resolve plugins const rawUserPlugins = ( (await asyncFlatten(config.plugins || [])) as Plugin[] @@ -607,6 +588,24 @@ export async function resolveConfig( const BASE_URL = resolvedBase // resolve worker + let workerConfig = mergeConfig({}, config) + const [workerPrePlugins, workerNormalPlugins, workerPostPlugins] = + sortUserPlugins(rawWorkerUserPlugins) + + // run config hooks + const workerUserPlugins = [ + ...workerPrePlugins, + ...workerNormalPlugins, + ...workerPostPlugins + ] + for (const p of workerUserPlugins) { + if (p.config) { + const res = await p.config(workerConfig, configEnv) + if (res) { + workerConfig = mergeConfig(workerConfig, res) + } + } + } const resolvedWorkerOptions: ResolveWorkerOptions = { format: workerConfig.worker?.format || 'iife', plugins: [], @@ -663,7 +662,10 @@ export async function resolveConfig( ...config.experimental } } - const resolved: ResolvedConfig = Object.assign({}, config, resolvedConfig) + const resolved: ResolvedConfig = { + ...config, + ...resolvedConfig + } if (middlewareMode === 'ssr') { logger.warn( @@ -702,17 +704,15 @@ export async function resolveConfig( postPlugins ) - const workerResolved: ResolvedConfig = Object.assign( - {}, - config, - workerConfig, - resolvedConfig, - { - isWorker: true, - mainConfig: resolved - } - ) - resolved.worker.plugins = await resolvePlugins( + const workerResolved: ResolvedConfig = { + ...config, + ...workerConfig, + ...resolvedConfig, + isWorker: true, + mainConfig: resolved + } + + resolvedConfig.worker.plugins = await resolvePlugins( workerResolved, workerPrePlugins, workerNormalPlugins, @@ -723,7 +723,11 @@ export async function resolveConfig( await Promise.all( userPlugins .map((p) => p.configResolved?.(resolved)) - .concat(workerUserPlugins.map((p) => p.configResolved?.(workerResolved))) + .concat( + resolvedConfig.worker.plugins.map((p) => + p.configResolved?.(workerResolved) + ) + ) ) if (process.env.DEBUG) { From 924c4d6eccaef9d986fe65a9175c78c8c8088e6d Mon Sep 17 00:00:00 2001 From: yoho Date: Thu, 21 Jul 2022 11:19:23 +0800 Subject: [PATCH 4/5] chore: update --- packages/vite/src/node/config.ts | 62 ++++++++++++++++---------------- 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/packages/vite/src/node/config.ts b/packages/vite/src/node/config.ts index 135b3202aeb2b9..8e2d9667dffc1e 100644 --- a/packages/vite/src/node/config.ts +++ b/packages/vite/src/node/config.ts @@ -667,36 +667,6 @@ export async function resolveConfig( ...resolvedConfig } - 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` - ) - ) - } - if (middlewareMode === 'html') { - logger.warn( - colors.yellow( - `Setting server.middlewareMode to 'html' is deprecated, set server.middlewareMode to \`true\` instead` - ) - ) - } - - if ( - config.server?.force && - !isBuild && - config.optimizeDeps?.force === undefined - ) { - resolved.optimizeDeps.force = true - logger.warn( - colors.yellow( - `server.force is deprecated, use optimizeDeps.force instead` - ) - ) - } - ;(resolved.plugins as Plugin[]) = await resolvePlugins( resolved, prePlugins, @@ -730,6 +700,38 @@ export async function resolveConfig( ) ) + // 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` + ) + ) + } + if (middlewareMode === 'html') { + logger.warn( + colors.yellow( + `Setting server.middlewareMode to 'html' is deprecated, set server.middlewareMode to \`true\` instead` + ) + ) + } + + if ( + config.server?.force && + !isBuild && + config.optimizeDeps?.force === undefined + ) { + resolved.optimizeDeps.force = true + logger.warn( + colors.yellow( + `server.force is deprecated, use optimizeDeps.force instead` + ) + ) + } + if (process.env.DEBUG) { debug(`using resolved config: %O`, { ...resolved, From a93dc0a12fa7e9939f479291eef0a9290041175a Mon Sep 17 00:00:00 2001 From: yoho Date: Thu, 21 Jul 2022 11:23:13 +0800 Subject: [PATCH 5/5] fix: config --- packages/vite/src/node/config.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/vite/src/node/config.ts b/packages/vite/src/node/config.ts index 8e2d9667dffc1e..ef1b284f06b5a8 100644 --- a/packages/vite/src/node/config.ts +++ b/packages/vite/src/node/config.ts @@ -675,7 +675,6 @@ export async function resolveConfig( ) const workerResolved: ResolvedConfig = { - ...config, ...workerConfig, ...resolvedConfig, isWorker: true,