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