From 90d2fec77ff1a3a7d6079cc950e8fa655a776e91 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Mon, 22 Jul 2024 16:26:40 -0400 Subject: [PATCH] tidy up --- .../3-transform/client/transform-client.js | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/packages/svelte/src/compiler/phases/3-transform/client/transform-client.js b/packages/svelte/src/compiler/phases/3-transform/client/transform-client.js index b060c312f1..7733871ad4 100644 --- a/packages/svelte/src/compiler/phases/3-transform/client/transform-client.js +++ b/packages/svelte/src/compiler/phases/3-transform/client/transform-client.js @@ -420,20 +420,15 @@ export function client_component(source, analysis, options) { const id = b.id(analysis.name); const HMR = b.id('$.HMR'); + const existing = b.member(id, HMR, true); + const incoming = b.member(b.id('module.default'), HMR, true); + const accept_fn_body = [ b.stmt( - b.assignment( - '=', - b.member(b.member(b.id('module.default'), HMR, true), b.id('source')), - b.member(b.member(id, HMR, true), b.id('source')) - ) + b.assignment('=', b.member(incoming, b.id('source')), b.member(existing, b.id('source'))) ), b.stmt( - b.call( - '$.set', - b.member(b.member(id, HMR, true), b.id('source')), - b.member(b.member(b.id('module.default'), HMR, true), b.id('original')) - ) + b.call('$.set', b.member(existing, b.id('source')), b.member(incoming, b.id('original'))) ) ]; @@ -455,11 +450,7 @@ export function client_component(source, analysis, options) { const hmr = b.block([ b.stmt( - b.assignment( - '=', - id, - b.call('$.hmr', id, b.thunk(b.member(b.member(id, b.id('$.HMR'), true), b.id('source')))) - ) + b.assignment('=', id, b.call('$.hmr', id, b.thunk(b.member(existing, b.id('source'))))) ), b.stmt(b.call('import.meta.hot.accept', b.arrow([b.id('module')], b.block(accept_fn_body))))