From f748eb084721815878fd5d9cff08099d5769edfe Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Fri, 29 Jul 2022 13:59:21 +0200 Subject: [PATCH 1/4] refactor(schema): update vite config --- packages/schema/src/types/config.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/schema/src/types/config.ts b/packages/schema/src/types/config.ts index e21dfdaecc1..c14f6ad7647 100644 --- a/packages/schema/src/types/config.ts +++ b/packages/schema/src/types/config.ts @@ -1,13 +1,14 @@ import { ConfigSchema } from '../../schema/config' import type { ResolvedConfig } from 'c12' -import { UserConfig } from 'vite' -import { Options as VuePluginOptions } from '@vitejs/plugin-vue' +import type { UserConfig as ViteUserConfig } from 'vite' +import type { Options as VuePluginOptions } from '@vitejs/plugin-vue' type DeepPartial = T extends Function ? T : T extends Record ? { [P in keyof T]?: DeepPartial } : T /** User configuration in `nuxt.config` file */ export interface NuxtConfig extends DeepPartial> { - vite?: ConfigSchema['vite'] + // Avoid DeepPartial for vite config inteface (https://github.com/nuxt/framework/pull/4772) + vite?: ViteConfig [key: string]: any } @@ -28,7 +29,7 @@ export interface RuntimeConfig extends PrivateRuntimeConfig, RuntimeConfigNamesp public: PublicRuntimeConfig } -export interface ViteConfig extends UserConfig { +export interface ViteConfig extends ViteUserConfig { /** * Options passed to @vitejs/plugin-vue * @see https://github.com/vitejs/vite/tree/main/packages/plugin-vue From 4541cc5925569730fb772a8bd20e34b041ced3e3 Mon Sep 17 00:00:00 2001 From: pooya parsa Date: Fri, 29 Jul 2022 14:00:51 +0200 Subject: [PATCH 2/4] Update packages/schema/src/types/config.ts --- packages/schema/src/types/config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/schema/src/types/config.ts b/packages/schema/src/types/config.ts index c14f6ad7647..285ac2be4fc 100644 --- a/packages/schema/src/types/config.ts +++ b/packages/schema/src/types/config.ts @@ -7,7 +7,7 @@ type DeepPartial = T extends Function ? T : T extends Record ? { /** User configuration in `nuxt.config` file */ export interface NuxtConfig extends DeepPartial> { - // Avoid DeepPartial for vite config inteface (https://github.com/nuxt/framework/pull/4772) + // Avoid DeepPartial for vite config interface (#4772) vite?: ViteConfig [key: string]: any } From f9716a4948f6c00bcec4165d81e3a04510377516 Mon Sep 17 00:00:00 2001 From: pooya parsa Date: Fri, 29 Jul 2022 14:09:47 +0200 Subject: [PATCH 3/4] Update packages/schema/src/types/config.ts Co-authored-by: Daniel Roe --- packages/schema/src/types/config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/schema/src/types/config.ts b/packages/schema/src/types/config.ts index 285ac2be4fc..ff1faba0950 100644 --- a/packages/schema/src/types/config.ts +++ b/packages/schema/src/types/config.ts @@ -7,7 +7,7 @@ type DeepPartial = T extends Function ? T : T extends Record ? { /** User configuration in `nuxt.config` file */ export interface NuxtConfig extends DeepPartial> { - // Avoid DeepPartial for vite config interface (#4772) + // Avoid DeepPartial for vite config interface (#4772) vite?: ViteConfig [key: string]: any } From 45d249ea724b838a3e760b8afa5880a97c66e378 Mon Sep 17 00:00:00 2001 From: pooya parsa Date: Fri, 29 Jul 2022 14:34:26 +0200 Subject: [PATCH 4/4] Update packages/schema/src/types/config.ts Co-authored-by: Daniel Roe --- packages/schema/src/types/config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/schema/src/types/config.ts b/packages/schema/src/types/config.ts index ff1faba0950..3e365c131d7 100644 --- a/packages/schema/src/types/config.ts +++ b/packages/schema/src/types/config.ts @@ -8,7 +8,7 @@ type DeepPartial = T extends Function ? T : T extends Record ? { /** User configuration in `nuxt.config` file */ export interface NuxtConfig extends DeepPartial> { // Avoid DeepPartial for vite config interface (#4772) - vite?: ViteConfig + vite?: ConfigSchema['vite'] [key: string]: any }