Skip to content

webpack 5: ensure static query hashes array has deterministic order, only dispatch actions if that list changed #29538

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

Merged
merged 1 commit into from
Feb 17, 2021
Merged

webpack 5: ensure static query hashes array has deterministic order, only dispatch actions if that list changed #29538

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 28 additions & 14 deletions packages/gatsby/src/utils/webpack/static-query-mapper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import path from "path"
import { Store } from "redux"
import { Compiler, Module, NormalModule, Compilation } from "webpack"
import ConcatenatedModule from "webpack/lib/optimize/ConcatenatedModule"
import { isEqual } from "lodash"
import {
IGatsbyState,
IGatsbyPageComponent,
Expand Down Expand Up @@ -234,21 +235,34 @@ export class StaticQueryMapper {
}
}

this.store.dispatch({
type: `ADD_PENDING_TEMPLATE_DATA_WRITE`,
payload: {
componentPath: component.componentPath,
pages: component.pages,
},
})
// modules, chunks, chunkgroups can all have not-deterministic orders so
// just sort array of static queries we produced to ensure final result is deterministic
const staticQueryHashes = Array.from(allStaticQueries).sort()

this.store.dispatch({
type: `SET_STATIC_QUERIES_BY_TEMPLATE`,
payload: {
componentPath: component.componentPath,
staticQueryHashes: Array.from(allStaticQueries),
},
})
if (
!isEqual(
this.store
.getState()
.staticQueriesByTemplate.get(component.componentPath),
staticQueryHashes
)
) {
this.store.dispatch({
type: `ADD_PENDING_TEMPLATE_DATA_WRITE`,
payload: {
componentPath: component.componentPath,
pages: component.pages,
},
})

this.store.dispatch({
type: `SET_STATIC_QUERIES_BY_TEMPLATE`,
payload: {
componentPath: component.componentPath,
staticQueryHashes,
},
})
}
})

// In dev mode we want to write page-data when compilation succeeds
Expand Down