@@ -29,10 +29,10 @@ export default function solidPlugin(options: Partial<Options> = {}): Plugin {
29
29
: [ ] ;
30
30
31
31
// TODO: remove when fully removed from vite
32
- userConfig . alias = normalizeAliases ( userConfig . alias )
32
+ const legacyAlias = normalizeAliases ( userConfig . alias ) ;
33
33
34
- if ( ! userConfig . resolve ) userConfig . resolve = { }
35
- userConfig . resolve . alias = normalizeAliases ( userConfig . resolve ?. alias )
34
+ if ( ! userConfig . resolve ) userConfig . resolve = { } ;
35
+ userConfig . resolve . alias = [ ... legacyAlias , ... normalizeAliases ( userConfig . resolve ?. alias ) ] ;
36
36
37
37
return mergeAndConcat ( userConfig , {
38
38
/**
@@ -43,10 +43,7 @@ export default function solidPlugin(options: Partial<Options> = {}): Plugin {
43
43
resolve : {
44
44
conditions : [ 'solid' ] ,
45
45
dedupe : [ 'solid-js' , 'solid-js/web' ] ,
46
- alias : [
47
- { find : / ^ s o l i d - r e f r e s h $ / , replacement : runtimePublicPath } ,
48
- ...alias ,
49
- ] ,
46
+ alias : [ { find : / ^ s o l i d - r e f r e s h $ / , replacement : runtimePublicPath } , ...alias ] ,
50
47
} ,
51
48
optimizeDeps : {
52
49
include : [ 'solid-js/dev' , 'solid-js/web' ] ,
@@ -107,6 +104,5 @@ export default function solidPlugin(options: Partial<Options> = {}): Plugin {
107
104
function normalizeAliases ( alias : AliasOptions = [ ] ) : Alias [ ] {
108
105
return Array . isArray ( alias )
109
106
? alias
110
- : Object . entries ( alias ) . map ( ( [ find , replacement ] ) => ( { find, replacement } ) )
107
+ : Object . entries ( alias ) . map ( ( [ find , replacement ] ) => ( { find, replacement } ) ) ;
111
108
}
112
-
0 commit comments