diff --git a/packages/vite/src/executors/build/schema.d.ts b/packages/vite/src/executors/build/schema.d.ts index d9d511db55..b7f1f8fc8e 100644 --- a/packages/vite/src/executors/build/schema.d.ts +++ b/packages/vite/src/executors/build/schema.d.ts @@ -9,5 +9,5 @@ export interface ViteBuildExecutorOptions { manifest?: boolean | string; ssrManifest?: boolean | string; logLevel?: 'info' | 'warn' | 'error' | 'silent'; - mode?: string; + mode?: 'production' | 'development'; } diff --git a/packages/vite/src/executors/dev-server/dev-server.impl.ts b/packages/vite/src/executors/dev-server/dev-server.impl.ts index 4d32085ea7..6a81b372ec 100644 --- a/packages/vite/src/executors/dev-server/dev-server.impl.ts +++ b/packages/vite/src/executors/dev-server/dev-server.impl.ts @@ -16,7 +16,7 @@ export default async function* viteDevServerExecutor( context: ExecutorContext ): AsyncGenerator<{ success: boolean; baseUrl: string }> { const mergedOptions = { - ...getBuildTargetOptions(options, context), + ...getBuildTargetOptions(options.buildTarget, context), ...options, } as ViteDevServerExecutorOptions & ViteBuildExecutorOptions; diff --git a/packages/vite/src/executors/dev-server/schema.d.ts b/packages/vite/src/executors/dev-server/schema.d.ts index f883ef9e35..9941be7b4d 100644 --- a/packages/vite/src/executors/dev-server/schema.d.ts +++ b/packages/vite/src/executors/dev-server/schema.d.ts @@ -9,6 +9,6 @@ export interface ViteDevServerExecutorOptions { open?: string | boolean; cors?: boolean; logLevel?: info | warn | error | silent; - mode?: string; + mode?: 'production' | 'development'; clearScreen?: boolean; } diff --git a/packages/vite/src/utils/options-utils.ts b/packages/vite/src/utils/options-utils.ts index 76a80a6f2b..cb878905ea 100644 --- a/packages/vite/src/utils/options-utils.ts +++ b/packages/vite/src/utils/options-utils.ts @@ -28,7 +28,7 @@ export async function getBuildAndSharedConfig( const projectRoot = context.workspace.projects[context.projectName].root; return mergeConfig({}, { - mode: options.mode, + mode: options.mode ?? context.configurationName, root: projectRoot, base: options.base, configFile: normalizeConfigFilePath( @@ -97,10 +97,10 @@ export function getServerOptions( } export function getBuildTargetOptions( - options: ViteDevServerExecutorOptions, + buildTarget: string, context: ExecutorContext ) { - const target = parseTargetString(options.buildTarget); + const target = parseTargetString(buildTarget); return readTargetOptions(target, context); }