File tree Expand file tree Collapse file tree 1 file changed +6
-10
lines changed
Expand file tree Collapse file tree 1 file changed +6
-10
lines changed Original file line number Diff line number Diff line change @@ -271,24 +271,20 @@ async function resolveConfig(
271271 cwd ,
272272 )
273273 if ( viteUserConfig ) {
274- // const alias = viteUserConfig.resolve?.alias
275- if ( ( Array . isArray as ( arg : any ) => arg is readonly any [ ] ) ( alias ) ) {
274+ const viteAlias = viteUserConfig . resolve ?. alias
275+
276+ if ( ( Array . isArray as ( arg : any ) => arg is readonly any [ ] ) ( viteAlias ) ) {
276277 throw new TypeError (
277278 'Unsupported resolve.alias in Vite config. Use object instead of array' ,
278279 )
279280 }
281+ if ( viteAlias ) {
282+ alias = { ...alias , ...viteAlias }
283+ }
280284
281285 if ( viteUserConfig . plugins ) {
282286 plugins = [ viteUserConfig . plugins as any , plugins ]
283287 }
284-
285- const viteAlias = viteUserConfig . resolve ?. alias
286- if (
287- viteAlias &&
288- ! ( Array . isArray as ( arg : any ) => arg is readonly any [ ] ) ( viteAlias )
289- ) {
290- alias = viteAlias
291- }
292288 }
293289 }
294290
You can’t perform that action at this time.
0 commit comments