From 7ef1fb6a3e6b75e74a41d545283dc0602dc9811e Mon Sep 17 00:00:00 2001 From: GatsbyJS Bot Date: Tue, 15 Feb 2022 09:58:43 -0700 Subject: [PATCH] fix(gatsby): Content Sync DSG bug (#34799) (#34818) (cherry picked from commit bfd04d362b31ccebdf93e63dee6f0786fe27ef0d) Co-authored-by: Tyler Barnes --- packages/gatsby/src/utils/node-manifest.ts | 26 +++------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/packages/gatsby/src/utils/node-manifest.ts b/packages/gatsby/src/utils/node-manifest.ts index 91298109b761b..95c0e6bd40114 100644 --- a/packages/gatsby/src/utils/node-manifest.ts +++ b/packages/gatsby/src/utils/node-manifest.ts @@ -49,32 +49,18 @@ async function findPageOwnedByNodeId({ nodeId }: { nodeId: string }): Promise<{ const { pages, nodes } = state const { byNode } = state.queries - // in development queries are run on demand so we wont have an accurate nodeId->pages map until those pages are visited in the browser. We want this mapping before the page is visited in the browser so we can route to the right page in the browser. - // So in development we can just use the Map of all pages (pagePath -> pageNode) - // but for builds (preview inc builds or regular builds) we will have a full map - // of all nodeId's to pages they're queried on and we can use that instead since it - // will be a much smaller list of pages, resulting in better performance for large sites - const usingPagesMap: boolean = `development` === process.env.NODE_ENV - - const pagePathSetOrMap = usingPagesMap - ? // this is a Map of page path to page node - pages - : // this is a Set of page paths - byNode?.get(nodeId) - // the default page path is the first page found in // node id to page query tracking - let pagePath = byNode?.get(nodeId)?.values()?.next()?.value let foundPageBy: FoundPageBy = pagePath ? `queryTracking` : `none` - if (pagePathSetOrMap) { + if (pages) { let ownerPagePath: string | undefined let foundOwnerNodeId = false // for each page this nodeId is queried in - for (const pathOrPageObject of pagePathSetOrMap.values()) { + for (const pageObject of pages.values()) { // if we haven't found a page with this nodeId // set as page.ownerNodeId then run this logic. // this condition is on foundOwnerNodeId instead of ownerPagePath @@ -86,13 +72,7 @@ async function findPageOwnedByNodeId({ nodeId }: { nodeId: string }): Promise<{ break } - const path = ( - usingPagesMap - ? // in development we're using a Map, so the value here is a page object - (pathOrPageObject as IGatsbyPage).path - : // in builds we're using a Set so the page path is the value - pathOrPageObject - ) as string + const path = pageObject.path const fullPage: IGatsbyPage | undefined = pages.get(path)