refactor(gatsby): Make query queue constructable #13061
Conversation
Moocar
force-pushed
the
query-queue-make-contructable
branch
from
f83d752 to
1b5f5f5
Compare
|
Conflicts resolved |
DSchau
added
status: awaiting author response
wardpeet
left a comment
wardpeet
left a comment
There was a problem hiding this comment.
Looks good, just 2 questions
|
|
||
| const queryJobs = makeQueryJobs(pathnamesToRun) | ||
|
|
||
| const queue = queryQueue.makeBuild() |
There was a problem hiding this comment.
calling it makeBuild is a bit weird here, I get why it's called that way by checking the full PR but it doesn't really fit in my mind 😋 I can't come up with a better name either as I was thinking of makeStatic or makePassive but that's even weirder 😄
There was a problem hiding this comment.
Yeah, it makes sense within query-queue.js (since there's makeBuild and makeDevelop, but you're right that it's a bit confusing from outside.
The other possibility I considered was to move makeBuild into page-query-runner, and call it makeQueryQueue. That way we could pull makeDevelop directly into src/commands/develop.js (and just call it makeQueryQueue).
There was a problem hiding this comment.
I like what you're thinking. Moving makeDevelop in src/commands/develop.js probably makes the file more bloated which can also make it harder to understand.
I'll just merge after testing and let's have a look afterwards.
| return uniqDirties | ||
| } | ||
|
|
||
| const runInitialQueries = async activity => { |
There was a problem hiding this comment.
this is sooo much cleaner than what we had before! 👍
| writeAndMove(`pages.json`, JSON.stringify(pagesData, null, 4)), | ||
| writeAndMove(`sync-requires.js`, syncRequires), | ||
| writeAndMove(`async-requires.js`, asyncRequires), | ||
| writeAndMove(`match-paths.json`, JSON.stringify(matchPaths, null, 4)), |
There was a problem hiding this comment.
I think I removed it because the match-paths PR wasn't merged when I opened this PR. But that's resolved now. I'll add it back in. Great find!
|
Published in |
## Description gatsbyjs#13004 requires that page queries be executed _after_ the javascript build completes. To get there, we need to be able to process a batch of queries. The current code relies on a global query queue, and uses complex global events to ensure it's paused/resumed during bootstrap. This PR makes the queue constructable so that a batch of queries can be processed easily. I also noticed that `develop` queue is much more complex that the `build` queue, so I've separated those into two queue constructors. ## Related Issues - Sub-PR of gatsbyjs#13004 - builds on gatsbyjs#13016
4 participants
Description
#13004 requires that page queries be executed after the javascript build completes. To get there, we need to be able to process a batch of queries. The current code relies on a global query queue, and uses complex global events to ensure it's paused/resumed during bootstrap. This PR makes the queue constructable so that a batch of queries can be processed easily.
I also noticed that
developqueue is much more complex that thebuildqueue, so I've separated those into two queue constructors.Related Issues