Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

fix: Fix sitemap urls when using folders (#3281)

Oleg Isonencc6dc6481bba
diff --git a/apps/builder/app/shared/$resources/sitemap.xml.server.ts b/apps/builder/app/shared/$resources/sitemap.xml.server.ts
index 332db41b23..5a4659ae35 100644
--- 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
index c79a347296..80e6d6e474 100644
--- a/fixtures/webstudio-cloudflare-template/app/__generated__/[sitemap.xml].ts
+++ b/fixtures/webstudio-cloudflare-template/app/__generated__/[sitemap.xml].ts
@@ -1,6 +1,6 @@
export const sitemap = [
{
- path: "",
+ path: "/",
lastModified: "2024-02-01",
},
];
diff --git a/fixtures/webstudio-custom-template/app/__generated__/[sitemap.xml].ts b/fixtures/webstudio-custom-template/app/__generated__/[sitemap.xml].ts
index 63df77dcf1..f01802de47 100644
--- a/fixtures/webstudio-custom-template/app/__generated__/[sitemap.xml].ts
+++ b/fixtures/webstudio-custom-template/app/__generated__/[sitemap.xml].ts
@@ -1,6 +1,6 @@
export const sitemap = [
{
- path: "",
+ path: "/",
lastModified: "2024-04-23",
},
{
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
index c79a347296..80e6d6e474 100644
--- a/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/[sitemap.xml].ts
+++ b/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/[sitemap.xml].ts
@@ -1,6 +1,6 @@
export const sitemap = [
{
- path: "",
+ path: "/",
lastModified: "2024-02-01",
},
];
diff --git a/fixtures/webstudio-remix-netlify-functions/app/__generated__/[sitemap.xml].ts b/fixtures/webstudio-remix-netlify-functions/app/__generated__/[sitemap.xml].ts
index c79a347296..80e6d6e474 100644
--- a/fixtures/webstudio-remix-netlify-functions/app/__generated__/[sitemap.xml].ts
+++ b/fixtures/webstudio-remix-netlify-functions/app/__generated__/[sitemap.xml].ts
@@ -1,6 +1,6 @@
export const sitemap = [
{
- path: "",
+ path: "/",
lastModified: "2024-02-01",
},
];
diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[sitemap.xml].ts b/fixtures/webstudio-remix-vercel/app/__generated__/[sitemap.xml].ts
index d6c0a76b5c..abd0a898d7 100644
--- a/fixtures/webstudio-remix-vercel/app/__generated__/[sitemap.xml].ts
+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[sitemap.xml].ts
@@ -1,6 +1,6 @@
export const sitemap = [
{
- path: "",
+ path: "/",
lastModified: "2024-02-01",
},
{
@@ -20,7 +20,7 @@ export const sitemap = [
lastModified: "2024-02-01",
},
{
- path: "/nested-page",
+ path: "/nested/nested-page",
lastModified: "2024-02-01",
},
];
diff --git a/packages/cli/src/prebuild.ts b/packages/cli/src/prebuild.ts
index 6880f387cf..0e9f76d34b 100644
--- 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
index 4f76a9a1a9..23e5c2e79e 100644
--- 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],
}))
);