Skip to content

Commit fa6449e

Browse files
authored
chore(cli): export * from vite (#161)
1 parent c462827 commit fa6449e

1 file changed

Lines changed: 29 additions & 53 deletions

File tree

packages/cli/src/index.ts

Lines changed: 29 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import {
2+
type ConfigEnv,
23
defineConfig as defineViteConfig,
34
resolveConfig as resolveViteConfig,
4-
type ResolvedConfig,
5+
type ResolvedConfig as ViteResolvedConfig,
56
type UserConfig,
67
type UserConfigExport,
78
type UserConfigFn,
@@ -23,26 +24,16 @@ export type FmtConfig = {
2324
};
2425
};
2526

26-
type ExtendsConfig<T> = T extends UserConfig ? T & {
27-
extends?: string;
28-
test?: ViteUserConfig['test'];
29-
lint?: LintConfig;
30-
fmt?: FmtConfig;
31-
}
32-
: T extends Promise<UserConfig> ? Promise<
33-
UserConfig & {
34-
extends?: string;
35-
test?: ViteUserConfig['test'];
36-
lint?: LintConfig;
37-
fmt?: FmtConfig;
38-
}
39-
>
40-
: T extends UserConfigFnObject ? T & {
41-
extends?: string;
42-
test?: ViteUserConfig['test'];
43-
lint?: LintConfig;
44-
fmt?: FmtConfig;
45-
}
27+
type VitePlusConfig = {
28+
extends?: string;
29+
test?: ViteUserConfig['test'];
30+
lint?: LintConfig;
31+
fmt?: FmtConfig;
32+
};
33+
34+
type ExtendsConfig<T> = T extends UserConfig ? T & VitePlusConfig
35+
: T extends Promise<UserConfig> ? Promise<UserConfig & VitePlusConfig>
36+
: T extends UserConfigFnObject ? (env: ConfigEnv) => UserConfig & VitePlusConfig
4637
: T extends UserConfigFnPromise ? Promise<
4738
UserConfig & {
4839
extends?: string;
@@ -51,38 +42,21 @@ type ExtendsConfig<T> = T extends UserConfig ? T & {
5142
fmt?: FmtConfig;
5243
}
5344
>
54-
: T extends UserConfigFn ? T & {
55-
extends?: string;
56-
test?: ViteUserConfig['test'];
57-
lint?: LintConfig;
58-
fmt?: FmtConfig;
59-
}
45+
: T extends UserConfigFn ? T & VitePlusConfig
6046
: T extends UserConfigExport ? UserConfigExport
6147
: T;
6248

63-
type UniversalResolvedConfig = ResolvedConfig & {
49+
type ResolvedConfig = ViteResolvedConfig & {
6450
lint?: LintConfig;
6551
fmt?: FmtConfig;
6652
};
6753

6854
function defineConfig(
69-
config: UserConfig & {
70-
extends?: string;
71-
test?: ViteUserConfig['test'];
72-
lint?: LintConfig;
73-
fmt?: FmtConfig;
74-
},
75-
): UserConfig;
55+
config: UserConfig & VitePlusConfig,
56+
): UserConfig & VitePlusConfig;
7657
function defineConfig(
77-
config: Promise<
78-
UserConfig & {
79-
extends?: string;
80-
test?: ViteUserConfig['test'];
81-
lint?: LintConfig;
82-
fmt?: FmtConfig;
83-
}
84-
>,
85-
): Promise<UserConfig>;
58+
config: Promise<UserConfig & VitePlusConfig>,
59+
): Promise<UserConfig & VitePlusConfig>;
8660
function defineConfig(
8761
config: ExtendsConfig<UserConfigFnObject>,
8862
): UserConfigFnObject;
@@ -98,18 +72,20 @@ function defineConfig(
9872
}
9973

10074
function resolveConfig(
101-
config: UserConfig & {
102-
extends?: string;
103-
test?: ViteUserConfig['test'];
104-
lint?: LintConfig;
105-
fmt?: FmtConfig;
106-
},
75+
config: UserConfig & VitePlusConfig,
10776
command: 'build' | 'serve',
10877
defaultMode?: string,
10978
defaultNodeEnv?: string,
11079
isPreview?: boolean,
111-
): Promise<UniversalResolvedConfig> {
112-
return resolveViteConfig(config, command, defaultMode, defaultNodeEnv, isPreview);
80+
): Promise<ResolvedConfig> {
81+
return resolveViteConfig(
82+
config,
83+
command,
84+
defaultMode,
85+
defaultNodeEnv,
86+
isPreview,
87+
);
11388
}
11489

115-
export { defineConfig, resolveConfig };
90+
export * from 'rolldown-vite';
91+
export { defineConfig, resolveConfig, type ResolvedConfig };

0 commit comments

Comments
 (0)