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
refactor: revert remix redirect method (#2951)
Bogdan Chadkin2d5e5c88f9ec
diff --git a/fixtures/webstudio-custom-template/app/routes/[hello]._index.ts b/fixtures/webstudio-custom-template/app/routes/[hello]._index.tsindex d50d2207ad..ed9261af6d 100644--- a/fixtures/webstudio-custom-template/app/routes/[hello]._index.ts+++ b/fixtures/webstudio-custom-template/app/routes/[hello]._index.ts@@ -1,3 +1,5 @@-export const loader = () => {- return Response.redirect("/world", 301);+import { type LoaderArgs, redirect } from "@remix-run/server-runtime";++export const loader = (arg: LoaderArgs) => {+ return redirect("/world", 301);};diff --git a/fixtures/webstudio-custom-template/app/routes/[script-test]._index.tsx b/fixtures/webstudio-custom-template/app/routes/[script-test]._index.tsxindex 01aa33be6a..1a8b01c000 100644--- a/fixtures/webstudio-custom-template/app/routes/[script-test]._index.tsx+++ b/fixtures/webstudio-custom-template/app/routes/[script-test]._index.tsx@@ -6,6 +6,7 @@ import {type ActionArgs,type LoaderArgs,json,+ redirect,} from "@remix-run/server-runtime";import { useLoaderData } from "@remix-run/react";import type { ProjectMeta } from "@webstudio-is/sdk";@@ -42,7 +43,7 @@ export const loader = async (arg: LoaderArgs) => {pageMeta.status === 301 || pageMeta.status === 302? pageMeta.status: 302;- return Response.redirect(pageMeta.redirect, status);+ return redirect(pageMeta.redirect, status);}const host =diff --git a/fixtures/webstudio-custom-template/app/routes/[world]._index.tsx b/fixtures/webstudio-custom-template/app/routes/[world]._index.tsxindex 8e2eeb39fb..1575d5d1d9 100644--- a/fixtures/webstudio-custom-template/app/routes/[world]._index.tsx+++ b/fixtures/webstudio-custom-template/app/routes/[world]._index.tsx@@ -6,6 +6,7 @@ import {type ActionArgs,type LoaderArgs,json,+ redirect,} from "@remix-run/server-runtime";import { useLoaderData } from "@remix-run/react";import type { ProjectMeta } from "@webstudio-is/sdk";@@ -42,7 +43,7 @@ export const loader = async (arg: LoaderArgs) => {pageMeta.status === 301 || pageMeta.status === 302? pageMeta.status: 302;- return Response.redirect(pageMeta.redirect, status);+ return redirect(pageMeta.redirect, status);}const host =diff --git a/fixtures/webstudio-custom-template/app/routes/_index.tsx b/fixtures/webstudio-custom-template/app/routes/_index.tsxindex 34e4f63d34..39dfe4e4e6 100644--- a/fixtures/webstudio-custom-template/app/routes/_index.tsx+++ b/fixtures/webstudio-custom-template/app/routes/_index.tsx@@ -6,6 +6,7 @@ import {type ActionArgs,type LoaderArgs,json,+ redirect,} from "@remix-run/server-runtime";import { useLoaderData } from "@remix-run/react";import type { ProjectMeta } from "@webstudio-is/sdk";@@ -42,7 +43,7 @@ export const loader = async (arg: LoaderArgs) => {pageMeta.status === 301 || pageMeta.status === 302? pageMeta.status: 302;- return Response.redirect(pageMeta.redirect, status);+ return redirect(pageMeta.redirect, status);}const host =diff --git a/fixtures/webstudio-remix-netlify-edge-functions/app/routes/_index.tsx b/fixtures/webstudio-remix-netlify-edge-functions/app/routes/_index.tsxindex 34e4f63d34..39dfe4e4e6 100644--- a/fixtures/webstudio-remix-netlify-edge-functions/app/routes/_index.tsx+++ b/fixtures/webstudio-remix-netlify-edge-functions/app/routes/_index.tsx@@ -6,6 +6,7 @@ import {type ActionArgs,type LoaderArgs,json,+ redirect,} from "@remix-run/server-runtime";import { useLoaderData } from "@remix-run/react";import type { ProjectMeta } from "@webstudio-is/sdk";@@ -42,7 +43,7 @@ export const loader = async (arg: LoaderArgs) => {pageMeta.status === 301 || pageMeta.status === 302? pageMeta.status: 302;- return Response.redirect(pageMeta.redirect, status);+ return redirect(pageMeta.redirect, status);}const host =diff --git a/fixtures/webstudio-remix-netlify-functions/app/routes/_index.tsx b/fixtures/webstudio-remix-netlify-functions/app/routes/_index.tsxindex 34e4f63d34..39dfe4e4e6 100644--- a/fixtures/webstudio-remix-netlify-functions/app/routes/_index.tsx+++ b/fixtures/webstudio-remix-netlify-functions/app/routes/_index.tsx@@ -6,6 +6,7 @@ import {type ActionArgs,type LoaderArgs,json,+ redirect,} from "@remix-run/server-runtime";import { useLoaderData } from "@remix-run/react";import type { ProjectMeta } from "@webstudio-is/sdk";@@ -42,7 +43,7 @@ export const loader = async (arg: LoaderArgs) => {pageMeta.status === 301 || pageMeta.status === 302? pageMeta.status: 302;- return Response.redirect(pageMeta.redirect, status);+ return redirect(pageMeta.redirect, status);}const host =diff --git a/fixtures/webstudio-remix-vercel/app/routes/[_route_with_symbols_]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[_route_with_symbols_]._index.tsxindex 2aae58ea42..5cd09060c8 100644--- a/fixtures/webstudio-remix-vercel/app/routes/[_route_with_symbols_]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/routes/[_route_with_symbols_]._index.tsx@@ -6,6 +6,7 @@ import {type ActionArgs,type LoaderArgs,json,+ redirect,} from "@remix-run/server-runtime";import { useLoaderData } from "@remix-run/react";import type { ProjectMeta } from "@webstudio-is/sdk";@@ -42,7 +43,7 @@ export const loader = async (arg: LoaderArgs) => {pageMeta.status === 301 || pageMeta.status === 302? pageMeta.status: 302;- return Response.redirect(pageMeta.redirect, status);+ return redirect(pageMeta.redirect, status);}const host =diff --git a/fixtures/webstudio-remix-vercel/app/routes/[form]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[form]._index.tsxindex 6165854dbd..9bfbdfa87f 100644--- a/fixtures/webstudio-remix-vercel/app/routes/[form]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/routes/[form]._index.tsx@@ -6,6 +6,7 @@ import {type ActionArgs,type LoaderArgs,json,+ redirect,} from "@remix-run/server-runtime";import { useLoaderData } from "@remix-run/react";import type { ProjectMeta } from "@webstudio-is/sdk";@@ -42,7 +43,7 @@ export const loader = async (arg: LoaderArgs) => {pageMeta.status === 301 || pageMeta.status === 302? pageMeta.status: 302;- return Response.redirect(pageMeta.redirect, status);+ return redirect(pageMeta.redirect, status);}const host =diff --git a/fixtures/webstudio-remix-vercel/app/routes/[heading-with-id]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[heading-with-id]._index.tsxindex a239c5379f..5c534e1838 100644--- a/fixtures/webstudio-remix-vercel/app/routes/[heading-with-id]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/routes/[heading-with-id]._index.tsx@@ -6,6 +6,7 @@ import {type ActionArgs,type LoaderArgs,json,+ redirect,} from "@remix-run/server-runtime";import { useLoaderData } from "@remix-run/react";import type { ProjectMeta } from "@webstudio-is/sdk";@@ -42,7 +43,7 @@ export const loader = async (arg: LoaderArgs) => {pageMeta.status === 301 || pageMeta.status === 302? pageMeta.status: 302;- return Response.redirect(pageMeta.redirect, status);+ return redirect(pageMeta.redirect, status);}const host =diff --git a/fixtures/webstudio-remix-vercel/app/routes/[nested].[nested-page]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[nested].[nested-page]._index.tsxindex a2743329b3..12a73c9015 100644--- a/fixtures/webstudio-remix-vercel/app/routes/[nested].[nested-page]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/routes/[nested].[nested-page]._index.tsx@@ -6,6 +6,7 @@ import {type ActionArgs,type LoaderArgs,json,+ redirect,} from "@remix-run/server-runtime";import { useLoaderData } from "@remix-run/react";import type { ProjectMeta } from "@webstudio-is/sdk";@@ -42,7 +43,7 @@ export const loader = async (arg: LoaderArgs) => {pageMeta.status === 301 || pageMeta.status === 302? pageMeta.status: 302;- return Response.redirect(pageMeta.redirect, status);+ return redirect(pageMeta.redirect, status);}const host =diff --git a/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsxindex 52efd7b0eb..9dd572fe4f 100644--- a/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsx@@ -6,6 +6,7 @@ import {type ActionArgs,type LoaderArgs,json,+ redirect,} from "@remix-run/server-runtime";import { useLoaderData } from "@remix-run/react";import type { ProjectMeta } from "@webstudio-is/sdk";@@ -42,7 +43,7 @@ export const loader = async (arg: LoaderArgs) => {pageMeta.status === 301 || pageMeta.status === 302? pageMeta.status: 302;- return Response.redirect(pageMeta.redirect, status);+ return redirect(pageMeta.redirect, status);}const host =diff --git a/fixtures/webstudio-remix-vercel/app/routes/[resources]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[resources]._index.tsxindex 5eb50505bf..b6cc3640f6 100644--- a/fixtures/webstudio-remix-vercel/app/routes/[resources]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/routes/[resources]._index.tsx@@ -6,6 +6,7 @@ import {type ActionArgs,type LoaderArgs,json,+ redirect,} from "@remix-run/server-runtime";import { useLoaderData } from "@remix-run/react";import type { ProjectMeta } from "@webstudio-is/sdk";@@ -42,7 +43,7 @@ export const loader = async (arg: LoaderArgs) => {pageMeta.status === 301 || pageMeta.status === 302? pageMeta.status: 302;- return Response.redirect(pageMeta.redirect, status);+ return redirect(pageMeta.redirect, status);}const host =diff --git a/fixtures/webstudio-remix-vercel/app/routes/_index.tsx b/fixtures/webstudio-remix-vercel/app/routes/_index.tsxindex 34e4f63d34..39dfe4e4e6 100644--- a/fixtures/webstudio-remix-vercel/app/routes/_index.tsx+++ b/fixtures/webstudio-remix-vercel/app/routes/_index.tsx@@ -6,6 +6,7 @@ import {type ActionArgs,type LoaderArgs,json,+ redirect,} from "@remix-run/server-runtime";import { useLoaderData } from "@remix-run/react";import type { ProjectMeta } from "@webstudio-is/sdk";@@ -42,7 +43,7 @@ export const loader = async (arg: LoaderArgs) => {pageMeta.status === 301 || pageMeta.status === 302? pageMeta.status: 302;- return Response.redirect(pageMeta.redirect, status);+ return redirect(pageMeta.redirect, status);}const host =diff --git a/packages/cli/src/prebuild.ts b/packages/cli/src/prebuild.tsindex 27b8563a14..735afae25f 100644--- a/packages/cli/src/prebuild.ts+++ b/packages/cli/src/prebuild.ts@@ -711,10 +711,14 @@ ${utilsExport}for (const redirect of redirects) {const redirectPagePath = generateRemixRoute(redirect.old);const redirectFileName = `${redirectPagePath}.ts`;- const content = `export const loader = () => {- return Response.redirect("${redirect.new}", ${redirect.status ?? 301});++ const content = `import { type LoaderArgs, redirect } from "@remix-run/server-runtime";++export const loader = (arg: LoaderArgs) => {+ return redirect("${redirect.new}", ${redirect.status ?? 301});};`;+await ensureFileInPath(join(routesDir, redirectFileName), content);}}diff --git a/packages/cli/templates/defaults/__templates__/route-template.tsx b/packages/cli/templates/defaults/__templates__/route-template.tsxindex 1898a11711..2b04be8c6e 100644--- a/packages/cli/templates/defaults/__templates__/route-template.tsx+++ b/packages/cli/templates/defaults/__templates__/route-template.tsx@@ -6,6 +6,7 @@ import {type ActionArgs,type LoaderArgs,json,+ redirect,} from "@remix-run/server-runtime";import { useLoaderData } from "@remix-run/react";import type { ProjectMeta } from "@webstudio-is/sdk";@@ -42,7 +43,7 @@ export const loader = async (arg: LoaderArgs) => {pageMeta.status === 301 || pageMeta.status === 302? pageMeta.status: 302;- return Response.redirect(pageMeta.redirect, status);+ return redirect(pageMeta.redirect, status);}const host =