Revert "feat!: default compoments for 3xx"

This reverts commit 22320f1.

Author: avevotsira

packages/astro/src/core/app/index.ts

@@ -22,12 +22,12 @@ import {
 } from '../path.js';
 import { RenderContext } from '../render-context.js';
 import { createAssetLink } from '../render/ssr-element.js';
+import { redirectTemplate } from '../routing/3xx.js';
 import { ensure404Route } from '../routing/astro-designed-error-pages.js';
 import { createDefaultRoutes } from '../routing/default.js';
 import { matchRoute } from '../routing/match.js';
 import { type AstroSession, PERSIST_SYMBOL } from '../session.js';
 import { AppPipeline } from './pipeline.js';
-import { default3xxPage } from '../routing/3xx.js';
 
 export { deserializeManifest } from './common.js';
 
@@ -313,12 +313,20 @@ export class App {
 
 		if (redirect !== url.pathname) {
 			const status = request.method === 'GET' ? 301 : 308;
-			return default3xxPage({
-				status,
-				relativeLocation: url.pathname,
-				absoluteLocation: redirect,
-				from: request.url,
-			});
+			return new Response(
+				redirectTemplate({
+					status,
+					relativeLocation: url.pathname,
+					absoluteLocation: redirect,
+					from: request.url,
+				}),
+				{
+					status,
+					headers: {
+						location: redirect + url.search,
+					},
+				},
+			);
 		}
 
 		addCookieHeader = renderOptions?.addCookieHeader;

packages/astro/src/core/build/generate.ts

@@ -36,7 +36,7 @@ import { getRedirectLocationOrThrow, routeIsRedirect } from '../redirects/index.
 import { RenderContext } from '../render-context.js';
 import { callGetStaticPaths } from '../render/route-cache.js';
 import { createRequest } from '../request.js';
-import redirectTemplate from '../../template/3xx.js';
+import { redirectTemplate } from '../routing/3xx.js';
 import { matchRoute } from '../routing/match.js';
 import { stringifyParams } from '../routing/params.js';
 import { getOutputFilename } from '../util.js';

packages/astro/src/core/constants.ts

@@ -46,11 +46,6 @@ export const ROUTE_TYPE_HEADER = 'X-Astro-Route-Type';
  */
 export const DEFAULT_404_COMPONENT = 'astro-default-404.astro';
 
-/**
- * The value of the `component` field of the default 3xx page, which is used when there is no user-provided 3xx.astro page.
- */
-export const DEFAULT_3XX_COMPONENT = 'astro-default-3xx.astro';
-
 /**
  * A response with one of these status codes will create a redirect response.
  */

packages/astro/src/core/routing/3xx.ts

@@ -1,67 +1,25 @@
-import redirectTemplate, { type RedirectTemplateOptions } from '../../template/3xx.js';
-import type { RoutesList, ComponentInstance } from '../../types/astro.js';
-import type { RouteData } from '../../types/public/index.js';
-import { DEFAULT_3XX_COMPONENT } from '../constants.js';
-
-export const DEFAULT_3XX_ROUTE: RouteData = {
-	component: DEFAULT_3XX_COMPONENT,
-	generate: () => '',
-	params: [],
-	pattern: /\/3xx/,
-	prerender: false,
-	pathname: '/3xx',
-	segments: [[{ content: '3xx', dynamic: false, spread: false }]],
-	type: 'page',
-	route: '/3xx',
-	fallbackRoutes: [],
-	isIndex: false,
-	origin: 'internal',
+type RedirectTemplate = {
+	from?: string;
+	absoluteLocation: string | URL;
+	status: number;
+	relativeLocation: string;
 };
 
-export function ensure3xxRoute(manifest: RoutesList) {
-	if (!manifest.routes.some((route) => route.route === '/3xx')) {
-		manifest.routes.push(DEFAULT_3XX_ROUTE);
-	}
-	return manifest;
-}
-
-export async function default3xxPage({
+export function redirectTemplate({
 	status,
 	absoluteLocation,
 	relativeLocation,
 	from,
-}: RedirectTemplateOptions) {
-	return new Response(
-		redirectTemplate({
-			status,
-			absoluteLocation,
-			relativeLocation,
-			from,
-		}),
-		{
-			status,
-			headers: { 'Content-Type': 'text/html' },
-		},
-	);
-}
-
-// mark the function as an AstroComponentFactory for the rendering internals
-default3xxPage.isAstroComponentFactory = true;
-
-export const default3xxInstance: ComponentInstance = {
-	default: default3xxPage,
-};
-
-// A short delay causes Google to interpret the redirect as temporary.
-// https://developers.google.com/search/docs/crawling-indexing/301-redirects#metarefresh
-
-export async function injectRedirectMetaTags(html: string, location: string, status: number) {
+}: RedirectTemplate) {
+	// A short delay causes Google to interpret the redirect as temporary.
+	// https://developers.google.com/search/docs/crawling-indexing/301-redirects#metarefresh
 	const delay = status === 302 ? 2 : 0;
-	return html.replace(
-		/<head[^>]*>/i,
-		`$&
-    <meta http-equiv="refresh" content="${delay};url=${location}">
-    <meta name="robots" content="noindex">
-    <link rel="canonical" href="${location}">`,
-	);
+	return `<!doctype html>
+<title>Redirecting to: ${relativeLocation}</title>
+<meta http-equiv="refresh" content="${delay};url=${relativeLocation}">
+<meta name="robots" content="noindex">
+<link rel="canonical" href="${absoluteLocation}">
+<body>
+	<a href="${relativeLocation}">Redirecting ${from ? `from <code>${from}</code> ` : ''}to <code>${relativeLocation}</code></a>
+</body>`;
 }

packages/astro/src/core/routing/default.ts

@@ -1,12 +1,11 @@
 import type { ComponentInstance } from '../../types/astro.js';
 import type { SSRManifest } from '../app/types.js';
-import { DEFAULT_3XX_COMPONENT, DEFAULT_404_COMPONENT } from '../constants.js';
+import { DEFAULT_404_COMPONENT } from '../constants.js';
 import {
 	SERVER_ISLAND_COMPONENT,
 	SERVER_ISLAND_ROUTE,
 	createEndpoint as createServerIslandEndpoint,
 } from '../server-islands/endpoint.js';
-import { default3xxInstance, DEFAULT_3XX_ROUTE } from './3xx.js';
 import { DEFAULT_404_ROUTE, default404Instance } from './astro-designed-error-pages.js';
 
 type DefaultRouteParams = {
@@ -16,11 +15,7 @@ type DefaultRouteParams = {
 	component: string;
 };
 
-export const DEFAULT_COMPONENTS = [
-	DEFAULT_3XX_COMPONENT,
-	DEFAULT_404_COMPONENT,
-	SERVER_ISLAND_COMPONENT,
-];
+export const DEFAULT_COMPONENTS = [DEFAULT_404_COMPONENT, SERVER_ISLAND_COMPONENT];
 
 export function createDefaultRoutes(manifest: SSRManifest): DefaultRouteParams[] {
 	const root = new URL(manifest.hrefRoot);
@@ -31,12 +26,6 @@ export function createDefaultRoutes(manifest: SSRManifest): DefaultRouteParams[]
 			route: DEFAULT_404_ROUTE.route,
 			component: DEFAULT_404_COMPONENT,
 		},
-		{
-			instance: default3xxInstance,
-			matchesComponent: (filePath) => filePath.href === new URL(DEFAULT_3XX_COMPONENT, root).href,
-			route: DEFAULT_3XX_ROUTE.route,
-			component: DEFAULT_3XX_COMPONENT,
-		},
 		{
 			instance: createServerIslandEndpoint(manifest),
 			matchesComponent: (filePath) => filePath.href === new URL(SERVER_ISLAND_COMPONENT, root).href,

packages/astro/src/template/3xx.ts

@@ -14,6 +14,7 @@ import { routeIsRedirect } from '../core/redirects/index.js';
 import { RenderContext } from '../core/render-context.js';
 import { getProps } from '../core/render/index.js';
 import { createRequest } from '../core/request.js';
+import { redirectTemplate } from '../core/routing/3xx.js';
 import { matchAllRoutes } from '../core/routing/index.js';
 import { isRoute3xx, isRoute404, isRoute500 } from '../core/routing/match.js';
 import { PERSIST_SYMBOL } from '../core/session.js';
@@ -22,7 +23,6 @@ import type { ComponentInstance, RoutesList } from '../types/astro.js';
 import type { RouteData } from '../types/public/internal.js';
 import type { DevPipeline } from './pipeline.js';
 import { writeSSRResult, writeWebResponse } from './response.js';
-import { injectRedirectMetaTags } from '../core/routing/3xx.js';
 
 type AsyncReturnType<T extends (...args: any) => Promise<any>> = T extends (
 	...args: any
@@ -339,7 +339,16 @@ export async function handleRoute({
 			const headers = Object.fromEntries(redirectResponse.headers.entries());
 
 			const html = await redirectResponse.text();
-			const injectedHtml = await injectRedirectMetaTags(html, location, response.status);
+
+			const delay = response.status === 302 ? 2 : 0;
+
+			const injectedHtml = html.replace(
+				/<head[^>]*>/i,
+				`$&
+				<meta http-equiv="refresh" content="${delay};url=${location}">
+				<meta name="robots" content="noindex">
+				<link rel="canonical" href="${location}">`,
+			);
 
 			response = new Response(injectedHtml, {
 				status: response.status,