Merge pull request #236 from withastro/main

a12111

.changeset/moody-doors-wink.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Returns custom statusText that has been set in a Response

.changeset/rich-apes-divide.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Server islands: changes the server island HTML placeholder comment so that it is much less likely to get removed by HTML minifiers.

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

@@ -107,7 +107,8 @@ export class NodeApp extends App {
 	 * @param destination NodeJS ServerResponse
 	 */
 	static async writeResponse(source: Response, destination: ServerResponse) {
-		const { status, headers, body } = source;
+		const { status, headers, body, statusText } = source;
+		destination.statusMessage = statusText;
 		destination.writeHead(status, createOutgoingHttpHeaders(headers));
 		if (!body) return destination.end();
 		try {

packages/astro/src/runtime/server/render/server-islands.ts

@@ -47,7 +47,7 @@ export function renderServerIsland(
 				}
 			}
 
-			destination.write('<!--server-island-start-->');
+			destination.write('<!--[if astro]>server-island-start<![endif]-->');
 
 			// Render the slots
 			const renderedSlots: Record<string, string> = {};
@@ -88,7 +88,7 @@ if(response.status === 200 && response.headers.get('content-type') === 'text/htm
 	// Swap!
 	while(script.previousSibling &&
 		script.previousSibling.nodeType !== 8 &&
-		script.previousSibling.data !== 'server-island-start') {
+		script.previousSibling.data !== '[if astro]>server-island-start<![endif]') {
 		script.previousSibling.remove();
 	}
 	script.previousSibling?.remove();

packages/astro/src/vite-plugin-astro-server/response.ts

@@ -53,7 +53,7 @@ export function writeHtmlResponse(res: http.ServerResponse, statusCode: number,
 }
 
 export async function writeWebResponse(res: http.ServerResponse, webResponse: Response) {
-	const { status, headers, body } = webResponse;
+	const { status, headers, body, statusText } = webResponse;
 
 	// Attach any set-cookie headers added via Astro.cookies.set()
 	const setCookieHeaders = Array.from(getSetCookiesFromResponse(webResponse));
@@ -67,7 +67,7 @@ export async function writeWebResponse(res: http.ServerResponse, webResponse: Re
 	if (headers.has('set-cookie')) {
 		_headers['set-cookie'] = headers.getSetCookie();
 	}
-
+	res.statusMessage = statusText;
 	res.writeHead(status, _headers);
 	if (body) {
 		if (Symbol.for('astro.responseBody') in webResponse) {

packages/astro/test/fixtures/ssr-api-route/src/pages/food.json.js

@@ -5,14 +5,19 @@ export function GET() {
 			{ name: 'lettuce' },
 			{ name: 'broccoli' },
 			{ name: 'pizza' }
-		])
+		]), {
+			status: 200,
+			statusText: `tasty`,
+		}
 	)
 }
 
 export async function POST({ params, request }) {
 	const body = await request.text();
-	return new Response(body === `some data` ? `ok` : `not ok`, {
-		status: 200,
+	const ok = body === `some data`
+	return new Response( ok ? `ok` : `not ok`, {
+		status: ok ? 200 : 400,
+		statusText: ok ? `ok` : `not ok`,
 		headers: {
 			'Content-Type': 'application/x-www-form-urlencoded'
 		}

packages/astro/test/ssr-api-route.test.js

@@ -33,6 +33,7 @@ describe('API routes in SSR', () => {
 			const request = new Request('http://example.com/food.json');
 			const response = await app.render(request);
 			assert.equal(response.status, 200);
+			assert.equal(response.statusText, 'tasty');
 			const body = await response.json();
 			assert.equal(body.length, 3);
 		});
@@ -78,6 +79,17 @@ describe('API routes in SSR', () => {
 			assert.equal(text, 'ok');
 		});
 
+		it('Can read custom status text from API routes', async () => {
+			const response = await fixture.fetch('/food.json', {
+				method: 'POST',
+				body: `not some data`,
+			});
+			assert.equal(response.status, 400);
+			assert.equal(response.statusText, 'not ok');
+			const text = await response.text();
+			assert.equal(text, 'not ok');
+		});
+
 		it('Can be passed binary data from multipart formdata', async () => {
 			const formData = new FormData();
 			const raw = await fs.promises.readFile(