Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(hmr): simplify fetchUpdate #9881

Merged
merged 8 commits into from
Aug 29, 2022
Merged

refactor(hmr): simplify fetchUpdate #9881

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
067b117
refactor(hmr): simplify fetchUpdate
sapphi-red Aug 28, 2022
c47364e
refactor(hmr): simplify fetchUpdate
sapphi-red Aug 28, 2022
e5c95e8
refactor(hmr): simplify fetchUpdate
sapphi-red Aug 28, 2022
dceb9a5
refactor(hmr): simplify fetchUpdate
sapphi-red Aug 28, 2022
29ae0e5
refactor(hmr): simplify fetchUpdate
sapphi-red Aug 28, 2022
1fc0a66
refactor(hmr): simplify fetchUpdate
sapphi-red Aug 28, 2022
18f0ea9
refactor(hmr): simplify fetchUpdate
sapphi-red Aug 28, 2022
32f3168
refactor(hmr): simplify fetchUpdate
sapphi-red Aug 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 20 additions & 37 deletions packages/vite/src/client/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,46 +400,29 @@ async function fetchUpdate({ path, acceptedPath, timestamp }: Update) {
const moduleMap = new Map<string, ModuleNamespace>()
const isSelfUpdate = path === acceptedPath

// make sure we only import each dep once
const modulesToUpdate = new Set<string>()
if (isSelfUpdate) {
// self update - only update self
modulesToUpdate.add(path)
} else {
// dep update
for (const { deps } of mod.callbacks) {
deps.forEach((dep) => {
if (acceptedPath === dep) {
modulesToUpdate.add(dep)
}
})
}
}
Comment on lines -404 to -417
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

modulesToUpdate was always new Set([]) or new Set([acceptedPath]).

Because:

  • in if (isSelfUpdate) block
    • path === acceptedPath is true so it's calling modulesToUpdate.add(acceptedPath)
  • in else block
    • it's only calling modulesToUpdate.add(dep) when acceptedPath === dep. So it's calling modulesToUpdate.add(acceptedPath).


// determine the qualified callbacks before we re-import the modules
const qualifiedCallbacks = mod.callbacks.filter(({ deps }) => {
return deps.some((dep) => modulesToUpdate.has(dep))
})

await Promise.all(
Array.from(modulesToUpdate).map(async (dep) => {
const disposer = disposeMap.get(dep)
if (disposer) await disposer(dataMap.get(dep))
const [path, query] = dep.split(`?`)
try {
const newMod: ModuleNamespace = await import(
/* @vite-ignore */
base +
path.slice(1) +
`?import&t=${timestamp}${query ? `&${query}` : ''}`
)
moduleMap.set(dep, newMod)
} catch (e) {
warnFailedFetch(e, dep)
}
})
const qualifiedCallbacks = mod.callbacks.filter(({ deps }) =>
deps.includes(acceptedPath)
)

if (isSelfUpdate || qualifiedCallbacks.length > 0) {
const dep = acceptedPath
const disposer = disposeMap.get(dep)
if (disposer) await disposer(dataMap.get(dep))
const [path, query] = dep.split(`?`)
try {
const newMod: ModuleNamespace = await import(
/* @vite-ignore */
base +
path.slice(1) +
`?import&t=${timestamp}${query ? `&${query}` : ''}`
)
moduleMap.set(dep, newMod)
} catch (e) {
warnFailedFetch(e, dep)
}
}

return () => {
for (const { deps, fn } of qualifiedCallbacks) {
fn(deps.map((dep) => moduleMap.get(dep)))
Expand Down