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

fix: main browserHash after stable optimization rerun #7284

Merged
merged 1 commit into from Mar 12, 2022
Merged

fix: main browserHash after stable optimization rerun #7284

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 12 additions & 5 deletions packages/vite/src/node/optimizer/index.ts
View file
Open in desktop
Expand Up @@ -250,6 +250,8 @@ export async function createOptimizeDepsRun(
JSON.stringify({ type: 'module' })
)

let newBrowserHash: string

let deps: Record<string, string>
if (!newDeps) {
// Initial optimizeDeps at server start. Perform a fast scan using esbuild to
Expand Down Expand Up @@ -281,7 +283,10 @@ export async function createOptimizeDepsRun(
}

// update browser hash
metadata.browserHash = getOptimizedBrowserHash(metadata.hash, deps)
newBrowserHash = metadata.browserHash = getOptimizedBrowserHash(
metadata.hash,
deps
)

// We generate the mapping of dependency ids to their cache file location
// before processing the dependencies with esbuild. This allow us to continue
Expand All @@ -291,7 +296,7 @@ export async function createOptimizeDepsRun(
metadata.optimized[id] = {
file: getOptimizedDepPath(id, config),
src: entry,
browserHash: metadata.browserHash,
browserHash: newBrowserHash,
processing: processing.promise
}
}
Expand All @@ -302,9 +307,10 @@ export async function createOptimizeDepsRun(

metadata.optimized = newDeps

// update global browser hash, but keep newDeps individual hashs until we know
// For reruns keep current global browser hash and newDeps individual hashes until we know
// if files are stable so we can avoid a full page reload
metadata.browserHash = getOptimizedBrowserHash(metadata.hash, deps)
metadata.browserHash = currentData!.browserHash
newBrowserHash = getOptimizedBrowserHash(metadata.hash, deps)
}

return { metadata, run: prebundleDeps }
Expand Down Expand Up @@ -499,8 +505,9 @@ export async function createOptimizeDepsRun(
// New deps that ended up with a different hash replaced while doing analysis import are going to
// return a not found so the browser doesn't cache them. And will properly get loaded after the reload
for (const id in deps) {
metadata.optimized[id].browserHash = metadata.browserHash
metadata.optimized[id].browserHash = newBrowserHash
}
metadata.browserHash = newBrowserHash
}

// Write metadata file, delete `deps` folder and rename the new `processing` folder to `deps` in sync
Expand Down