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: handle redirects for unmatched routes (#5846)
Oleg Isonen6ea83ef056f2
diff --git a/packages/cli/src/prebuild.test.ts b/packages/cli/src/prebuild.test.tsindex 672d6cee46..0c2ef3b200 100644--- a/packages/cli/src/prebuild.test.ts+++ b/packages/cli/src/prebuild.test.ts@@ -5,9 +5,11 @@ import {readdir,readFile,rm,+ symlink,writeFile,} from "node:fs/promises";import { join } from "node:path";+import { pathToFileURL } from "node:url";import { tmpdir } from "node:os";import { bundleVersion } from "@webstudio-is/protocol";import { generateRedirectsModule, prebuild } from "./prebuild";@@ -20,6 +22,35 @@ const rootFolderId = "root";const elementComponent = "ws:element";const slowPrebuildTestTimeout = 15_000;type Redirects = Array<{ old: string; new: string; status?: "301" | "302" }>;+type GeneratedRouteModule = {+ loader: (args: { request: Request }) => Response | Promise<Response>;+};++const importGeneratedRoute = async (path: string) => {+ await symlink(join(originalCwd, "node_modules"), "node_modules", "dir");+ return (await import(+ `${pathToFileURL(join(tempDir, path)).href}?test=${crypto.randomUUID()}`+ )) as GeneratedRouteModule;+};++const expectGeneratedRedirectFallback = async (path: string) => {+ const routeModule = await importGeneratedRoute(path);+ const redirectResponse = await routeModule.loader({+ request: new Request("https://example.com/dl.php?filename=file.pdf"),+ });+ expect(redirectResponse.status).toBe(301);+ expect(redirectResponse.headers.get("Location")).toBe("/downloads/file.pdf");++ try {+ await routeModule.loader({+ request: new Request("https://example.com/not-a-redirect"),+ });+ throw new Error("Expected unmatched request to throw a 404 response.");+ } catch (error) {+ expect(error).toBeInstanceOf(Response);+ expect((error as Response).status).toBe(404);+ }+};const getFilePaths = async (dir: string): Promise<string[]> => {const entries = await readdir(dir, { withFileTypes: true });@@ -302,6 +333,7 @@ describe("prebuild", () => {expect(routeTemplate).toContain("../__generated__/_index.server");expect(routeTemplate).not.toContain("__CLIENT__");expect(routeTemplate).not.toContain("__SERVER__");+ await expectGeneratedRedirectFallback("app/routes/$.tsx");await expect(readFile("app/__generated__/stale.ts", "utf8")diff --git a/packages/cli/src/prebuild.ts b/packages/cli/src/prebuild.tsindex 92d087880f..5baac98e85 100644--- a/packages/cli/src/prebuild.ts+++ b/packages/cli/src/prebuild.ts@@ -196,6 +196,28 @@ export const generateRedirectsModule = (pageRedirects: Pages["redirects"]) => {`;};+const generateRedirectFallbackRoute = (runtime: "remix" | "react-router") => {+ const loaderFunctionArgs =+ runtime === "react-router" ? "react-router" : "@remix-run/server-runtime";++ return `+ import { type LoaderFunctionArgs } from ${JSON.stringify(loaderFunctionArgs)};+ import { redirectRequest } from "../redirect-url";+ // @todo think about how to make __generated__ typeable+ // @ts-ignore+ import { redirects } from "../__generated__/$resources.redirects";++ export const loader = ({ request }: LoaderFunctionArgs) => {+ const redirectResponse = redirectRequest(request, redirects);+ if (redirectResponse !== undefined) {+ return redirectResponse;+ }++ throw new Response("Not Found", { status: 404 });+ };+ `;+};+export const prebuild = async (options: {/*** Do we need download assets@@ -732,6 +754,15 @@ export const prebuild = async (options: {generateRedirectsModule(pages.redirects));+ if (pages.redirects !== undefined && pages.redirects.length > 0) {+ await createFileIfNotExists(+ join(routesDir, "$.tsx"),+ generateRedirectFallbackRoute(+ options.template.includes("react-router") ? "react-router" : "remix"+ )+ );+ }+if (options.assets === true && siteData.assets.length > 0) {const downloading = spinner();downloading.start("Downloading fonts and images");