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.

refactor: move redirect into template (#3664)

Bogdan Chadkin50a17ebb8baf
diff --git a/fixtures/webstudio-custom-template/app/__generated__/[hello]._index.ts b/fixtures/webstudio-custom-template/app/__generated__/[hello]._index.ts
new file mode 100644
index 0000000000..8e537ee5d1
--- /dev/null
+++ b/fixtures/webstudio-custom-template/app/__generated__/[hello]._index.ts
@@ -0,0 +1,2 @@
+export const url = "/world";
+export const status = 301;
diff --git a/fixtures/webstudio-custom-template/app/routes/[hello]._index.ts b/fixtures/webstudio-custom-template/app/routes/[hello]._index.ts
index 42905d5320..8a4456debd 100644
--- a/fixtures/webstudio-custom-template/app/routes/[hello]._index.ts
+++ b/fixtures/webstudio-custom-template/app/routes/[hello]._index.ts
@@ -1,5 +1,6 @@
-import { type LoaderFunctionArgs, redirect } from "@remix-run/server-runtime";
+import { redirect } from "@remix-run/server-runtime";
+import { url, status } from "../__generated__/[hello]._index";
-export const loader = (arg: LoaderFunctionArgs) => {
- return redirect("/world", 301);
+export const loader = () => {
+ return redirect(url, status);
};
diff --git a/packages/cli/src/prebuild.ts b/packages/cli/src/prebuild.ts
index f44bd3eee7..db4b6e80a2 100644
--- a/packages/cli/src/prebuild.ts
+++ b/packages/cli/src/prebuild.ts
@@ -502,10 +502,12 @@ export const prebuild = async (options: {
const defaultSiteMapXmlPath = normalize(
join(routeTemplatesDir, "default-sitemap.tsx")
);
+ const redirectPath = normalize(join(routeTemplatesDir, "redirect.tsx"));
const routeFileTemplate = await readFile(routeTemplatePath, "utf8");
const routeXmlFileTemplate = await readFile(routeXmlTemplatePath, "utf8");
const defaultSiteMapTemplate = await readFile(defaultSiteMapXmlPath, "utf8");
+ const redirectTemplate = await readFile(redirectPath, "utf8");
await rm(routeTemplatesDir, { recursive: true, force: true });
for (const [pageId, pageComponents] of Object.entries(componentsByPage)) {
@@ -772,17 +774,22 @@ export const prebuild = async (options: {
const redirects = siteData.build.pages?.redirects;
if (redirects !== undefined && redirects.length > 0) {
for (const redirect of redirects) {
- const redirectPagePath = generateRemixRoute(redirect.old);
- const redirectFileName = `${redirectPagePath}.ts`;
-
- const content = `import { type LoaderFunctionArgs, redirect } from "@remix-run/server-runtime";
-
- export const loader = (arg: LoaderFunctionArgs) => {
- return redirect("${redirect.new}", ${redirect.status ?? 301});
- };
- `;
+ const generatedBasename = generateRemixRoute(redirect.old);
+ await createFileIfNotExists(
+ join(generatedDir, `${generatedBasename}.ts`),
+ `
+ export const url = "${redirect.new}";
+ export const status = ${redirect.status ?? 301};
+ `
+ );
- await createFileIfNotExists(join(routesDir, redirectFileName), content);
+ await createFileIfNotExists(
+ join(routesDir, `${generateRemixRoute(redirect.old)}.ts`),
+ redirectTemplate.replaceAll(
+ "__REDIRECT__",
+ `../__generated__/${generatedBasename}`
+ )
+ );
}
}
diff --git a/packages/cli/templates/defaults/app/route-templates/redirect.tsx b/packages/cli/templates/defaults/app/route-templates/redirect.tsx
new file mode 100644
index 0000000000..398cff3f91
--- /dev/null
+++ b/packages/cli/templates/defaults/app/route-templates/redirect.tsx
@@ -0,0 +1,6 @@
+import { redirect } from "@remix-run/server-runtime";
+import { url, status } from "__REDIRECT__";
+
+export const loader = () => {
+ return redirect(url, status);
+};
diff --git a/packages/react-sdk/placeholder.d.ts b/packages/react-sdk/placeholder.d.ts
index e1a331c100..6c06e11342 100644
--- a/packages/react-sdk/placeholder.d.ts
+++ b/packages/react-sdk/placeholder.d.ts
@@ -48,3 +48,8 @@ declare module "__SITEMAP__" {
lastModified: string;
}>;
}
+
+declare module "__REDIRECT__" {
+ export const url: string;
+ export const status: number;
+}