[pull] main from withastro:main

packages/astro/test/units/app/astro-response.test.js

@@ -0,0 +1,98 @@
+// @ts-check
+import assert from 'node:assert/strict';
+import { describe, it } from 'node:test';
+import { App } from '../../../dist/core/app/app.js';
+import { createComponent, render } from '../../../dist/runtime/server/index.js';
+import { createManifest, createRouteInfo } from './test-helpers.js';
+
+const notFoundRouteData = {
+	route: '/not-found',
+	component: 'src/pages/not-found.astro',
+	params: [],
+	pathname: '/not-found',
+	distURL: [],
+	pattern: /^\/not-found\/?$/,
+	segments: [[{ content: 'not-found', dynamic: false, spread: false }]],
+	type: 'page',
+	prerender: false,
+	fallbackRoutes: [],
+	isIndex: false,
+	origin: 'project',
+};
+
+const notFoundCustomRouteData = {
+	route: '/not-found-custom',
+	component: 'src/pages/not-found-custom.astro',
+	params: [],
+	pathname: '/not-found-custom',
+	distURL: [],
+	pattern: /^\/not-found-custom\/?$/,
+	segments: [[{ content: 'not-found-custom', dynamic: false, spread: false }]],
+	type: 'page',
+	prerender: false,
+	fallbackRoutes: [],
+	isIndex: false,
+	origin: 'project',
+};
+
+const notFoundPage = createComponent(() => {
+	return new Response(null, {
+		status: 404,
+		statusText: 'Not found',
+	});
+});
+
+const notFoundCustomPage = createComponent((result, props, slots) => {
+	const Astro = result.createAstro(props, slots);
+	Astro.response.status = 404;
+	return render`<div>Custom 404</div>`;
+});
+
+const pageMap = new Map([
+	[
+		notFoundRouteData.component,
+		async () => ({
+			page: async () => ({
+				default: notFoundPage,
+			}),
+		}),
+	],
+	[
+		notFoundCustomRouteData.component,
+		async () => ({
+			page: async () => ({
+				default: notFoundCustomPage,
+			}),
+		}),
+	],
+]);
+
+const app = new App(
+	createManifest({
+		routes: [createRouteInfo(notFoundRouteData), createRouteInfo(notFoundCustomRouteData)],
+		pageMap,
+	}),
+);
+
+describe('Returning responses', () => {
+	it('Works from a page', async () => {
+		const response = await app.render(new Request('http://example.com/not-found'));
+		assert.equal(response.status, 404);
+	});
+
+	it('Returns the default 404 if body is null', async () => {
+		const response = await app.render(new Request('http://example.com/not-found'));
+		const html = await response.text();
+
+		assert.equal(response.status, 404);
+		assert.equal(html.includes('<pre>Path: /not-found</pre>'), true);
+	});
+
+	it('Returns the page if body is not null', async () => {
+		const response = await app.render(new Request('http://example.com/not-found-custom'));
+		const html = await response.text();
+
+		assert.equal(response.status, 404);
+		assert.equal(html.includes('Custom 404'), true);
+	});
+});

packages/astro/test/units/app/error-pages.test.js

@@ -3,60 +3,7 @@ import assert from 'node:assert/strict';
 import { describe, it } from 'node:test';
 import { App } from '../../../dist/core/app/app.js';
 import { createComponent, maybeRenderHead, render } from '../../../dist/runtime/server/index.js';
-
-function createManifest({ routes, pageMap, trailingSlash = 'ignore' }) {
-	const rootDir = new URL('file:///astro-test/');
-	const buildDir = new URL('file:///astro-test/dist/');
-
-	return {
-		adapterName: 'test-adapter',
-		routes,
-		site: undefined,
-		base: '/',
-		userAssetsBase: undefined,
-		trailingSlash,
-		buildFormat: 'directory',
-		compressHTML: false,
-		assetsPrefix: undefined,
-		renderers: [],
-		serverLike: true,
-		clientDirectives: new Map(),
-		entryModules: {},
-		inlinedScripts: new Map(),
-		assets: new Set(),
-		componentMetadata: new Map(),
-		pageModule: undefined,
-		pageMap,
-		serverIslandMappings: undefined,
-		key: Promise.resolve(/** @type {CryptoKey} */ ({})),
-		i18n: undefined,
-		middleware: undefined,
-		actions: undefined,
-		sessionDriver: undefined,
-		checkOrigin: false,
-		allowedDomains: undefined,
-		sessionConfig: undefined,
-		cacheDir: rootDir,
-		srcDir: rootDir,
-		outDir: buildDir,
-		rootDir,
-		publicDir: rootDir,
-		assetsDir: 'assets',
-		buildClientDir: buildDir,
-		buildServerDir: buildDir,
-		csp: undefined,
-		image: {},
-		shouldInjectCspMetaTags: false,
-		devToolbar: {
-			enabled: false,
-			latestAstroVersion: undefined,
-			debugInfoOutput: undefined,
-			placement: undefined,
-		},
-		internalFetchHeaders: undefined,
-		logLevel: 'silent',
-	};
-}
+import { createManifest } from './test-helpers.js';
 
 describe('App render error pages', () => {
 	it('preserves headers and body for 500 responses from routes', async () => {

packages/astro/test/units/app/locals.test.js

@@ -2,60 +2,7 @@ import assert from 'node:assert/strict';
 import { describe, it } from 'node:test';
 import { App } from '../../../dist/core/app/app.js';
 import { createComponent, render } from '../../../dist/runtime/server/index.js';
-
-function createManifest({ routes, pageMap }) {
-	const rootDir = new URL('file:///astro-test/');
-	const buildDir = new URL('file:///astro-test/dist/');
-
-	return {
-		adapterName: 'test-adapter',
-		routes,
-		site: undefined,
-		base: '/',
-		userAssetsBase: undefined,
-		trailingSlash: 'ignore',
-		buildFormat: 'directory',
-		compressHTML: false,
-		assetsPrefix: undefined,
-		renderers: [],
-		serverLike: true,
-		clientDirectives: new Map(),
-		entryModules: {},
-		inlinedScripts: new Map(),
-		assets: new Set(),
-		componentMetadata: new Map(),
-		pageModule: undefined,
-		pageMap,
-		serverIslandMappings: undefined,
-		key: Promise.resolve(/** @type {CryptoKey} */ ({})),
-		i18n: undefined,
-		middleware: undefined,
-		actions: undefined,
-		sessionDriver: undefined,
-		checkOrigin: false,
-		allowedDomains: undefined,
-		sessionConfig: undefined,
-		cacheDir: rootDir,
-		srcDir: rootDir,
-		outDir: buildDir,
-		rootDir,
-		publicDir: rootDir,
-		assetsDir: 'assets',
-		buildClientDir: buildDir,
-		buildServerDir: buildDir,
-		csp: undefined,
-		image: {},
-		shouldInjectCspMetaTags: false,
-		devToolbar: {
-			enabled: false,
-			latestAstroVersion: undefined,
-			debugInfoOutput: undefined,
-			placement: undefined,
-		},
-		internalFetchHeaders: undefined,
-		logLevel: 'silent',
-	};
-}
+import { createManifest } from './test-helpers.js';
 
 const fooRouteData = {
 	route: '/foo',

packages/astro/test/units/app/response.test.js

@@ -2,60 +2,7 @@ import assert from 'node:assert/strict';
 import { describe, it } from 'node:test';
 import { App } from '../../../dist/core/app/app.js';
 import { createComponent, render } from '../../../dist/runtime/server/index.js';
-
-function createManifest({ routes, pageMap }) {
-	const rootDir = new URL('file:///astro-test/');
-	const buildDir = new URL('file:///astro-test/dist/');
-
-	return {
-		adapterName: 'test-adapter',
-		routes,
-		site: undefined,
-		base: '/',
-		userAssetsBase: undefined,
-		trailingSlash: 'ignore',
-		buildFormat: 'directory',
-		compressHTML: false,
-		assetsPrefix: undefined,
-		renderers: [],
-		serverLike: true,
-		clientDirectives: new Map(),
-		entryModules: {},
-		inlinedScripts: new Map(),
-		assets: new Set(),
-		componentMetadata: new Map(),
-		pageModule: undefined,
-		pageMap,
-		serverIslandMappings: undefined,
-		key: Promise.resolve(/** @type {CryptoKey} */ ({})),
-		i18n: undefined,
-		middleware: undefined,
-		actions: undefined,
-		sessionDriver: undefined,
-		checkOrigin: false,
-		allowedDomains: undefined,
-		sessionConfig: undefined,
-		cacheDir: rootDir,
-		srcDir: rootDir,
-		outDir: buildDir,
-		rootDir,
-		publicDir: rootDir,
-		assetsDir: 'assets',
-		buildClientDir: buildDir,
-		buildServerDir: buildDir,
-		csp: undefined,
-		image: {},
-		shouldInjectCspMetaTags: false,
-		devToolbar: {
-			enabled: false,
-			latestAstroVersion: undefined,
-			debugInfoOutput: undefined,
-			placement: undefined,
-		},
-		internalFetchHeaders: undefined,
-		logLevel: 'silent',
-	};
-}
+import { createManifest } from './test-helpers.js';
 
 const statusRouteData = {
 	route: '/status-code',