Merge branch 'main' into fullscreen-preview

webstudio-is · May 2, 2024 · df0e203 · df0e203
2 parents 2c1d114 + cc6dc64
commit df0e203
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 13 deletions.
diff --git a/apps/builder/app/shared/$resources/sitemap.xml.server.ts b/apps/builder/app/shared/$resources/sitemap.xml.server.ts
@@ -46,9 +46,7 @@ export const loader = async ({ request }: { request: Request }) => {
 
   const pages = parsePages(build.pages);
 
-  const allPages = [pages.homePage, ...pages.pages];
-
-  const siteMap = getStaticSiteMapXml(allPages, build.updatedAt.toISOString());
+  const siteMap = getStaticSiteMapXml(pages, build.updatedAt.toISOString());
 
   return json(siteMap);
 };
diff --git a/fixtures/webstudio-cloudflare-template/app/__generated__/[sitemap.xml].ts b/fixtures/webstudio-cloudflare-template/app/__generated__/[sitemap.xml].ts
diff --git a/fixtures/webstudio-custom-template/app/__generated__/[sitemap.xml].ts b/fixtures/webstudio-custom-template/app/__generated__/[sitemap.xml].ts
diff --git a/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/[sitemap.xml].ts b/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/[sitemap.xml].ts
diff --git a/fixtures/webstudio-remix-netlify-functions/app/__generated__/[sitemap.xml].ts b/fixtures/webstudio-remix-netlify-functions/app/__generated__/[sitemap.xml].ts
diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[sitemap.xml].ts b/fixtures/webstudio-remix-vercel/app/__generated__/[sitemap.xml].ts
diff --git a/packages/cli/src/prebuild.ts b/packages/cli/src/prebuild.ts
@@ -680,7 +680,7 @@ export const projectMeta: ProjectMeta =
     join(generatedDir, "[sitemap.xml].ts"),
     `
       export const sitemap = ${JSON.stringify(
-        getStaticSiteMapXml(siteData.pages, siteData.build.updatedAt),
+        getStaticSiteMapXml(siteData.build.pages, siteData.build.updatedAt),
         null,
         2
       )};

diff --git a/packages/sdk/src/page-utils.ts b/packages/sdk/src/page-utils.ts
@@ -75,16 +75,17 @@ export const getPagePath = (id: Folder["id"] | Page["id"], pages: Pages) => {
   return paths.reverse().join("/").replace(/\/+/g, "/");
 };
 
-export const getStaticSiteMapXml = (pages: Page[], updatedAt: string) => {
+export const getStaticSiteMapXml = (pages: Pages, updatedAt: string) => {
+  const allPages = [pages.homePage, ...pages.pages];
   return (
-    pages
+    allPages
       // ignore pages with excludePageFromSearch bound to variables
       // because there is no data from cms available at build time
       .filter(
         (page) => executeExpression(page.meta.excludePageFromSearch) !== true
       )
       .map((page) => ({
-        path: page.path,
+        path: getPagePath(page.id, pages),
         lastModified: updatedAt.split("T")[0],
       }))
   );