merge

Rich-Harris · Rich-Harris · commit bf99eac4cf7b · 2022-08-31T12:25:40.000-04:00
diff --git a/.changeset/odd-sloths-sit.md b/.changeset/odd-sloths-sit.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+Print error if resolveOpts.ssr is set
diff --git a/packages/kit/src/runtime/server/index.js b/packages/kit/src/runtime/server/index.js
@@ -198,14 +198,13 @@ export async function respond(request, options, state) {
 		try {
 			if (opts) {
 				// TODO remove for 1.0
-				// @ts-expect-error
-				if (opts.transformPage) {
+				if ('transformPage' in opts) {
 					throw new Error(
 						'transformPage has been replaced by transformPageChunk — see https://github.com/sveltejs/kit/pull/5657 for more information'
 					);
 				}
-				// @ts-expect-error
-				if (opts.ssr) {
+
+				if ('ssr' in opts) {
 					throw new Error(
 						'ssr has been removed, set it in the appropriate +layout.js instead. See the PR for more information: https://github.com/sveltejs/kit/pull/6197'
 					);
