Merge branch 'master' into gh-754

.changeset/config.json

@@ -1,13 +1,10 @@
 {
-  "$schema": "https://unpkg.com/@changesets/config@1.4.0/schema.json",
-  "changelog": "@changesets/cli/changelog",
-  "commit": false,
-  "linked": [],
-  "access": "restricted",
-  "baseBranch": "master",
-  "updateInternalDependencies": "patch",
-  "ignore": [
-    "hn.svelte.dev",
-    "svelte-kit-demo"
-  ]
-}
+	"$schema": "https://unpkg.com/@changesets/config@1.4.0/schema.json",
+	"changelog": "@changesets/cli/changelog",
+	"commit": false,
+	"linked": [],
+	"access": "restricted",
+	"baseBranch": "master",
+	"updateInternalDependencies": "patch",
+	"ignore": ["hn.svelte.dev"]
+}

.changeset/lazy-carpets-join.md

@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+Report errors in hooks.js

.github/workflows/ci.yml

@@ -100,4 +100,4 @@ jobs:
             ${{ runner.os }}-${{ matrix.node-version }}
       - run: npm install -g pnpm
       - run: pnpm install --frozen-lockfile
-      - run: pnpm build && pnpm build --filter="svelte-kit-demo" --filter="hn.svelte.dev"
+      - run: pnpm build && pnpm build --filter="hn.svelte.dev"

packages/create-svelte/.gitignore

@@ -4,4 +4,8 @@
 /cli/versions.js
 
 /templates/*/.svelte
-/templates/*/build
+/templates/*/build
+/templates/*/.cloudflare
+/templates/*/.vercel_build_output
+/templates/*/.netlify
+/templates/*/dist

packages/kit/src/core/dev/index.js

@@ -11,7 +11,7 @@ import { create_app } from '../../core/create_app/index.js';
 import { rimraf } from '../filesystem/index.js';
 import { respond } from '../../runtime/server/index.js';
 import { getRawBody } from '../http/index.js';
-import { copy_assets, get_no_external } from '../utils.js';
+import { copy_assets, get_no_external, resolve_entry } from '../utils.js';
 import svelte from '@sveltejs/vite-plugin-svelte';
 import { get_server } from '../server/index.js';
 import '../../install-fetch.js';
@@ -136,19 +136,13 @@ class Watcher extends EventEmitter {
 
 					if (req.url === '/favicon.ico') return;
 
-					const hooks = /** @type {import('types/internal').Hooks} */ (await this.vite
-						.ssrLoadModule(`/${this.config.kit.files.hooks}`)
-						.catch(() => ({})));
+					/** @type {import('types/internal').Hooks} */
+					const hooks = resolve_entry(this.config.kit.files.hooks)
+						? await this.vite.ssrLoadModule(`/${this.config.kit.files.hooks}`)
+						: {};
 
-					let root;
-
-					try {
-						root = (await this.vite.ssrLoadModule(`/${this.dir}/generated/root.svelte`)).default;
-					} catch (e) {
-						res.statusCode = 500;
-						res.end(e.stack);
-						return;
-					}
+					const root = (await this.vite.ssrLoadModule(`/${this.dir}/generated/root.svelte`))
+						.default;
 
 					const rawBody = await getRawBody(req);
 
@@ -297,6 +291,7 @@ class Watcher extends EventEmitter {
 					}
 				} catch (e) {
 					this.vite.ssrFixStacktrace(e);
+					res.statusCode = 500;
 					res.end(e.stack);
 				}
 			});