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.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
fix: Serve custom sitemap pages in preview (#6586)
Oleg Isonen6f8bd0243206
diff --git a/.github/workflows/main.yml b/.github/workflows/main.ymlindex b33ed6a96b..210778eb3a 100644--- a/.github/workflows/main.yml+++ b/.github/workflows/main.yml@@ -199,7 +199,7 @@ jobs:builder-e2e:name: builder-e2e (${{ matrix.shard }})- timeout-minutes: ${{ matrix.shard == 'shard-5' && 18 || 12 }}+ timeout-minutes: ${{ (matrix.shard == 'shard-2' || matrix.shard == 'shard-5') && 18 || 12 }}needs: builder-e2e-builddiff --git a/packages/cli/src/prebuild.test.ts b/packages/cli/src/prebuild.test.tsindex 07ad11c439..43699b1aca 100644--- a/packages/cli/src/prebuild.test.ts+++ b/packages/cli/src/prebuild.test.ts@@ -2174,6 +2174,9 @@ describe("prebuild", () => {await expect(readFile("app/__generated__/$resources.sitemap.xml.ts", "utf8")).resolves.not.toContain('"path": "/draft"');+ await expect(+ readFile("app/routes/[sitemap.xml]._index.tsx", "utf8")+ ).resolves.toContain("sitemap.map");});test(@@ -7635,11 +7638,29 @@ export const createManagedFormResourceFetch = () => {];await writeSiteData(siteData);- await prebuild({ assets: false, template: ["react-router"] });+ await prebuild({+ assets: false,+ template: ["react-router"],+ preserveRouteTemplates: true,+ });await expect(readFile("app/__generated__/[sitemap.xml]._index.server.tsx", "utf8")).resolves.toContain('rootIds: [\n "sitemap-resource"');+ await expect(+ readFile("app/routes/[sitemap.xml]._index.tsx", "utf8")+ ).resolves.toContain("../__generated__/[sitemap.xml]._index");++ siteData.build.version += 1;+ await writeSiteData(siteData);+ await prebuild({+ assets: false,+ template: ["react-router"],+ incremental: true,+ });+ await expect(+ readFile("app/routes/[sitemap.xml]._index.tsx", "utf8")+ ).resolves.toContain("../__generated__/[sitemap.xml]._index");});test("emits static text pages at their configured paths", async () => {diff --git a/packages/cli/src/prebuild.ts b/packages/cli/src/prebuild.tsindex 60875f4ba1..6a7cbd81e4 100644--- a/packages/cli/src/prebuild.ts+++ b/packages/cli/src/prebuild.ts@@ -157,6 +157,7 @@ const contentRuntimeBundleUrl = new URL(const contentRuntimeFile = "$resources.asset-query-vendor.js";const appRoot = "app";const generatedDir = join(appRoot, "__generated__");+const sitemapModule = join(generatedDir, "$resources.sitemap.xml");const routesDir = join(appRoot, "routes");const generatedOutputDirectories = [generatedDir, routesDir] as const;@@ -2041,10 +2042,7 @@ export const createManagedFormResourceFetch = ({ request, context, projectDomain})) {const content = template.replaceAll("__CONSTANTS__", importFrom("./app/constants.mjs", file))- .replaceAll(- "__SITEMAP__",- importFrom(`./app/__generated__/$resources.sitemap.xml`, file)- )+ .replaceAll("__SITEMAP__", importFrom(sitemapModule, file)).replaceAll("__ASSETS__",importFrom(`./app/__generated__/$resources.assets`, file)@@ -2130,17 +2128,23 @@ export const action = async (args: Parameters<typeof pageAction>[0]) => {}// MARK: - Default sitemap.xml- for (const { file, template } of framework.defaultSitemap()) {- const content = template.replaceAll(- "__SITEMAP__",- importFrom(`./app/__generated__/$resources.sitemap.xml`, file)- );- await writeGeneratedFile(file, content);+ if (+ generatedPages.some(+ (page) => getPagePath(page.id, pages) === "/sitemap.xml"+ ) === false+ ) {+ for (const { file, template } of framework.defaultSitemap()) {+ const content = template.replaceAll(+ "__SITEMAP__",+ importFrom(sitemapModule, file)+ );+ await writeGeneratedFile(file, content);+ }}const sitemap = getStaticSiteMapXml(pages, siteData.build.updatedAt);await writeGeneratedFile(- join(generatedDir, "$resources.sitemap.xml.ts"),+ `${sitemapModule}.ts`,`export const sitemap: Array<{ path: string; lastModified: string }> = ${JSON.stringify(sitemap,