Skip to content

Track pages/layouts without queries fixes #3139 #3148 #3094 #3218

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 2 commits into from
Dec 14, 2017
Merged

Track pages/layouts without queries fixes #3139 #3148 #3094 #3218

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eaba6b7
Track pages/layouts without queries fixes #3139 #3148 #3094
KyleAMathews Dec 14, 2017
4527061
Fix formatting
KyleAMathews Dec 14, 2017
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
17 changes: 14 additions & 3 deletions packages/gatsby/src/internal-plugins/query-runner/page-query-runner.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ const runQueuedActions = async () => {
// query things in a 1/2 finished state.
emitter.on(`API_RUNNING_QUEUE_EMPTY`, runQueuedActions)

let seenIdsWithoutDataDependencies = []
const findIdsWithoutDataDependencies = () => {
const state = store.getState()
const allTrackedIds = _.uniq(
Expand All @@ -75,13 +76,22 @@ const findIdsWithoutDataDependencies = () => {

// Get list of paths not already tracked and run the queries for these
// paths.
return _.difference(
const notTrackedIds = _.difference(
[
...state.pages.map(p => p.path),
...state.layouts.map(l => `LAYOUT___${l.id}`),
],
allTrackedIds
[...allTrackedIds, ...seenIdsWithoutDataDependencies]
)

// Add new IDs to our seen array so we don't keep trying to run queries for them.
// Pages/Layouts without queries can't be tracked.
seenIdsWithoutDataDependencies = _.uniq([
...notTrackedIds,
...seenIdsWithoutDataDependencies,
])

return notTrackedIds
}

const runQueriesForIds = ids => {
Expand All @@ -105,8 +115,9 @@ const runQueriesForIds = ids => {
result => callback(null, result),
error => callback(error)
)
} else {
return callback(null, null)
}
return callback(null, null)
},
(error, result) => {
error ? reject(error) : resolve(result)
Expand Down