From 1aef252649a2e8cfa8273f1df1c02b13dd403897 Mon Sep 17 00:00:00 2001 From: azaleta <24407500@qq.com> Date: Wed, 29 Jun 2022 14:52:06 +0800 Subject: [PATCH 1/2] fix: HMR reload(resolver sideeffect) --- src/core/resolvers.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/core/resolvers.ts b/src/core/resolvers.ts index a1db240..86c1ffb 100644 --- a/src/core/resolvers.ts +++ b/src/core/resolvers.ts @@ -48,8 +48,13 @@ export function resolversAddon(resolvers: Resolver[]): Addon { const dynamic: ImportExtended[] = [] const sideEffects: ImportExtended[] = [] await Promise.all([...names].map(async (name) => { - if (matched.find(i => i.as === name)) + const matchedImport = matched.find(i => i.as === name) + if (matchedImport) { + if (Object.hasOwn(matchedImport, 'sideEffects')) + sideEffects.push(...toArray((matchedImport as ImportExtended).sideEffects).map(i => normalizeImport(i, ''))) + return + } const resolved = await firstMatchedResolver(resolvers, name) if (resolved) dynamic.push(resolved) From c64632178d73294e0e19c9eb967c98412b66baca Mon Sep 17 00:00:00 2001 From: Anthony Fu Date: Wed, 29 Jun 2022 15:30:44 +0800 Subject: [PATCH 2/2] Update src/core/resolvers.ts --- src/core/resolvers.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/resolvers.ts b/src/core/resolvers.ts index 86c1ffb..fdb5148 100644 --- a/src/core/resolvers.ts +++ b/src/core/resolvers.ts @@ -50,7 +50,7 @@ export function resolversAddon(resolvers: Resolver[]): Addon { await Promise.all([...names].map(async (name) => { const matchedImport = matched.find(i => i.as === name) if (matchedImport) { - if (Object.hasOwn(matchedImport, 'sideEffects')) + if ('sideEffects' in matchedImport) sideEffects.push(...toArray((matchedImport as ImportExtended).sideEffects).map(i => normalizeImport(i, ''))) return