Skip to content

Commit 847cdfe

Browse files
committed
🐛 Fix legacy alias warning
1 parent 7e9bec8 commit 847cdfe

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

src/index.ts

+5-9
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ export default function solidPlugin(options: Partial<Options> = {}): Plugin {
2929
: [];
3030

3131
// TODO: remove when fully removed from vite
32-
userConfig.alias = normalizeAliases(userConfig.alias)
32+
const legacyAlias = normalizeAliases(userConfig.alias);
3333

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)];
3636

3737
return mergeAndConcat(userConfig, {
3838
/**
@@ -43,10 +43,7 @@ export default function solidPlugin(options: Partial<Options> = {}): Plugin {
4343
resolve: {
4444
conditions: ['solid'],
4545
dedupe: ['solid-js', 'solid-js/web'],
46-
alias: [
47-
{ find: /^solid-refresh$/, replacement: runtimePublicPath },
48-
...alias,
49-
],
46+
alias: [{ find: /^solid-refresh$/, replacement: runtimePublicPath }, ...alias],
5047
},
5148
optimizeDeps: {
5249
include: ['solid-js/dev', 'solid-js/web'],
@@ -107,6 +104,5 @@ export default function solidPlugin(options: Partial<Options> = {}): Plugin {
107104
function normalizeAliases(alias: AliasOptions = []): Alias[] {
108105
return Array.isArray(alias)
109106
? alias
110-
: Object.entries(alias).map(([find, replacement]) => ({ find, replacement }))
107+
: Object.entries(alias).map(([find, replacement]) => ({ find, replacement }));
111108
}
112-

0 commit comments

Comments
 (0)