Improved handling of not found pages

Author: zonia3000

src/hooks.server.js

@@ -17,21 +17,26 @@ if (env.FRACTAL_SERVER_HOST.endsWith('/')) {
 }
 
 export async function handle({ event, resolve }) {
-	if (event.url.pathname.startsWith('/_app')) {
-		// The _app folder contains static files that are the result of npm build.
-		// The hooks handle function is not called when loading valid static files, however we can
-		// reach this point if a not existing file is requested. That could happen after an update
-		// if the browser is loading a cached page that references to outdated contents.
-		// In that case we can just skip the whole function.
-		return await resolve(event);
-	}
-
 	if (event.url.pathname.startsWith('/api')) {
 		// API page - AJAX request - handled in proxy'
 		logger.trace('API endpoint detected, leaving the handling to the proxy');
 		return await resolve(event);
 	}
 
+	if (event.route.id === null) {
+		if (event.url.pathname.startsWith('/_app')) {
+			// The _app folder contains static files that are the result of npm build.
+			// The hooks handle function is not called when loading valid static files, however we can
+			// reach this point if a not existing file is requested. That could happen after an update
+			// if the browser is loading a cached page that references to outdated contents.
+			// In that case we can usually ignore the logs.
+			logger.trace('[%s] - %s - [NOT FOUND]', event.request.method, event.url.pathname);
+		} else {
+			logger.info('[%s] - %s - [NOT FOUND]', event.request.method, event.url.pathname);
+		}
+		throw error(404, 'Route not found');
+	}
+
 	logger.info('[%s] - %s', event.request.method, event.url.pathname);
 
 	// Retrieve server info (alive and version)

tests/not_found.spec.js

@@ -0,0 +1,8 @@
+import { expect, test } from '@playwright/test';
+
+test('Handles not found pages', async ({ page }) => {
+	await page.goto('/foo');
+	await expect(page.getByText('Route not found')).toHaveCount(1);
+	await page.goto('/_app/foo');
+	await expect(page.getByText('Route not found')).toHaveCount(1);
+});