fix(plugin-sitemap): missing data in query results (#22843)

* fix: #22703 missing data in serialize funciton

* fix: revert a couple changes for url resolution to not change and get whole query

* refactor: move otherData spread to top so site is overritten by propper url if needed

* test: add test to confirm non standard data is passed

packages/gatsby-plugin-sitemap/src/__tests__/internals.js

@@ -137,6 +137,16 @@ describe(`results using non default alternatives`, () => {
             },
           ],
         },
+        otherData: {
+          nodes: [
+            {
+              name: `test`,
+            },
+            {
+              name: `test 2`,
+            },
+          ],
+        },
       },
     }
   }
@@ -161,5 +171,6 @@ describe(`results using non default alternatives`, () => {
     const queryRecords = filterQuery(results, [], ``, customSiteResolver)
 
     expect(queryRecords.site.siteMetadata.siteUrl).toEqual(customUrl)
+    expect(queryRecords).toHaveProperty(`otherData`)
   })
 })

packages/gatsby-plugin-sitemap/src/internals.js

@@ -20,7 +20,9 @@ export function filterQuery(
     throw new Error(errors.join(`, `))
   }
 
-  let { allPages, originalType } = getNodes(data.allSitePage)
+  const { allSitePage, ...otherData } = data
+
+  let { allPages, originalType } = getNodes(allSitePage)
 
   // Removing excluded paths
   allPages = allPages.filter(
@@ -53,6 +55,7 @@ export function filterQuery(
   siteUrl = withoutTrailingSlash(siteUrl)
 
   return {
+    ...otherData,
     allSitePage: {
       [originalType]:
         originalType === `nodes`