diff --git a/src/node/config.ts b/src/node/config.ts index 90deca05..bd98bd69 100644 --- a/src/node/config.ts +++ b/src/node/config.ts @@ -19,6 +19,7 @@ import { slash, type AdditionalConfig, type AdditionalConfigDict, + type Awaitable, type HeadConfig, type SiteData } from './shared' @@ -34,30 +35,40 @@ const resolve = (root: string, file: string) => export type UserConfigFn = ( env: ConfigEnv -) => UserConfig | Promise> +) => Awaitable> export type UserConfigExport = - | UserConfig - | Promise> + | Awaitable> | UserConfigFn /** * Type config helper */ -export function defineConfig(config: UserConfig) { +export function defineConfig( + config: UserConfig> +) { return config } +export type AdditionalConfigFn = ( + env: ConfigEnv +) => Awaitable> +export type AdditionalConfigExport = + | Awaitable> + | AdditionalConfigFn + /** - * Type additional config helper + * Type config helper for additional/locale-specific config */ -export function defineAdditionalConfig( - config: AdditionalConfig +export function defineAdditionalConfig( + config: AdditionalConfig> ) { return config } /** * Type config helper for custom theme config + * + * @deprecated use `defineConfig` instead */ export function defineConfigWithTheme( config: UserConfig @@ -65,15 +76,6 @@ export function defineConfigWithTheme( return config } -/** - * Type additional config helper - */ -export function defineAdditionalConfigWithTheme( - config: AdditionalConfig -) { - return config -} - export async function resolveConfig( root: string = process.cwd(), command: 'serve' | 'build' = 'serve',