feat(gatsby): track static queries by template #25549
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gatsbot
bot
added
the
status: triage needed
freiksenet
changed the title
|
Your pull request can be previewed in Gatsby Cloud: https://build-77739d43-5d4d-4856-8781-7a79634866a0.staging-previews.gtsb.io |
pieh
added
topic: StaticQuery
type: feature or enhancement
wardpeet
reviewed
Jul 9, 2020
Comment on lines
165
to
181
| // test(`are written correctly when using wrapRootElement`, async () => { | ||
| // const queries = [titleQuery] | ||
| // const pagePath = `/dynamic-import/` | ||
|
|
||
| // const { staticQueryHashes } = await readPageData(publicDir, pagePath) | ||
|
|
||
| // expect(staticQueryHashes.sort()).toEqual(queries.map(hashQuery).sort()) | ||
| // }) | ||
|
|
||
| // test(`are written correctly when using wrapPageElement`, async () => { | ||
| // const queries = [titleQuery] | ||
| // const pagePath = `/dynamic-import/` | ||
|
|
||
| // const { staticQueryHashes } = await readPageData(publicDir, pagePath) | ||
|
|
||
| // expect(staticQueryHashes.sort()).toEqual(queries.map(hashQuery).sort()) | ||
| // }) |
There was a problem hiding this comment.
shouldn't we enable these?
There was a problem hiding this comment.
Could you tell me why we don't enable them?
There was a problem hiding this comment.
I've enabled them, or like one of them cause they are redundant.
There was a problem hiding this comment.
We should remove them. They are indeed redundant.
packages/gatsby/src/redux/reducers/static-queries-by-template.ts
Outdated
Show resolved
Hide resolved
| if ( | ||
| !isEqual( | ||
| state.staticQueriesByTemplate.get(componentPath), | ||
| staticQueryHashes.map(String) |
There was a problem hiding this comment.
We shouldn't map here, right? We should do it when we save identifiers.
Suggested change
| staticQueryHashes.map(String) | |
| staticQueryHashes |
Comment on lines
31
to
64
| compiler.hooks.compilation.tap(`webpack-dep-tree-plugin`, compilation => { | ||
| compilation.hooks.seal.tap(`webpack-dep-tree-plugin`, () => { | ||
| const state = store.getState() | ||
| const mapOfTemplatesToStaticQueryHashes = mapTemplatesToStaticQueryHashes( | ||
| state, | ||
| compilation | ||
| ) | ||
|
|
||
| mapOfTemplatesToStaticQueryHashes.forEach( | ||
| (staticQueryHashes, componentPath) => { | ||
| if ( | ||
| !isEqual( | ||
| state.staticQueriesByTemplate.get(componentPath), | ||
| staticQueryHashes.map(String) | ||
| ) | ||
| ) { | ||
| store.dispatch({ | ||
| type: `ADD_PENDING_TEMPLATE_DATA_WRITE`, | ||
| payload: { | ||
| componentPath, | ||
| }, | ||
| }) | ||
| store.dispatch({ | ||
| type: `SET_STATIC_QUERIES_BY_TEMPLATE`, | ||
| payload: { | ||
| componentPath, | ||
| staticQueryHashes, | ||
| }, | ||
| }) | ||
| } | ||
| } | ||
| ) | ||
| }) | ||
| }) |
There was a problem hiding this comment.
This should be a webpack plugin instead of hacking it inside build-javascript command but this can be done later in the chain :)
wardpeet
reviewed
Jul 9, 2020
| @@ -194,9 +185,25 @@ export function mapTemplatesToStaticQueryHashes( | |||
|
|
|||
| mapOfTemplatesToStaticQueryHashes.set( | |||
| page.componentPath, | |||
| staticQueryHashes.sort() | |||
| staticQueryHashes.sort().map(String) | |||
There was a problem hiding this comment.
Suggested change
| staticQueryHashes.sort().map(String) | |
| staticQueryHashes.sort() |
|
one small suggestion and if ci is green i'm good with merging |
|
Heads up: Community folks have confirmed that the recursion fix by @freiksenet works! |
Avoid single char names Sort at traversal time Refactor reduce to forEach Refactor another reduce to forEach Fix type check Add check to prevent circular dependency problem Add integration tests Typecheck Address issues in review
freiksenet
force-pushed
the
feat/queries-by-template
branch
from
13353af to
ba7ac69
Compare
pvdz
approved these changes
Jul 13, 2020
pragmaticpat
pushed a commit
to pragmaticpat/gatsby
that referenced
this pull request
Apr 28, 2022
Track static queries by template Co-authored-by: Sidhartha Chatterjee <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Re-merging Sid's PR with a fix to detect circular dependency.
Related Issues
#25481 #25493