From 02eb042def762500fdd39373b819ab6b66a52080 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Tue, 18 Jan 2022 09:40:40 -0800
Subject: [PATCH] restore app-level hydrate option

---
 documentation/docs/14-configuration.md      | 1 +
 packages/kit/src/core/build/build_server.js | 1 +
 packages/kit/src/core/config/index.spec.js  | 4 ++--
 packages/kit/src/core/config/options.js     | 9 +--------
 packages/kit/src/core/config/test/index.js  | 2 +-
 packages/kit/src/runtime/server/index.js    | 5 +++--
 6 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/documentation/docs/14-configuration.md b/documentation/docs/14-configuration.md
index 646fee6fc278c..be442bb563e81 100644
--- a/documentation/docs/14-configuration.md
+++ b/documentation/docs/14-configuration.md
@@ -31,6 +31,7 @@ const config = {
 			protocol: null
 		},
 		host: null,
+		hydrate: true,
 		inlineStyleThreshold: 0,
 		methodOverride: {
 			parameter: '_method',
diff --git a/packages/kit/src/core/build/build_server.js b/packages/kit/src/core/build/build_server.js
index bba6113c0dd9c..c6f5a6a9e718a 100644
--- a/packages/kit/src/core/build/build_server.js
+++ b/packages/kit/src/core/build/build_server.js
@@ -68,6 +68,7 @@ export class App {
 				error.stack = this.options.get_stack(error);
 			},
 			hooks,
+			hydrate: ${s(config.kit.hydrate)},
 			manifest,
 			method_override: ${s(config.kit.methodOverride)},
 			paths: { base, assets },
diff --git a/packages/kit/src/core/config/index.spec.js b/packages/kit/src/core/config/index.spec.js
index 78beb12590dc0..ea53ebbdcc6d1 100644
--- a/packages/kit/src/core/config/index.spec.js
+++ b/packages/kit/src/core/config/index.spec.js
@@ -34,7 +34,7 @@ test('fills in defaults', () => {
 				protocol: null
 			},
 			host: null,
-			hydrate: null,
+			hydrate: true,
 			inlineStyleThreshold: 0,
 			methodOverride: {
 				parameter: '_method',
@@ -146,7 +146,7 @@ test('fills in partial blanks', () => {
 				protocol: null
 			},
 			host: null,
-			hydrate: null,
+			hydrate: true,
 			inlineStyleThreshold: 0,
 			methodOverride: {
 				parameter: '_method',
diff --git a/packages/kit/src/core/config/options.js b/packages/kit/src/core/config/options.js
index 3b97ac11f02f2..74f12bc258d00 100644
--- a/packages/kit/src/core/config/options.js
+++ b/packages/kit/src/core/config/options.js
@@ -73,14 +73,7 @@ const options = object(
 
 			host: string(null),
 
-			// TODO remove this for 1.0
-			hydrate: validate(null, (input) => {
-				if (input !== undefined) {
-					throw new Error(
-						'config.kit.hydrate has been removed — use the handle hook instead: https://kit.svelte.dev/docs#hooks-handle'
-					);
-				}
-			}),
+			hydrate: boolean(true),
 
 			inlineStyleThreshold: number(0),
 
diff --git a/packages/kit/src/core/config/test/index.js b/packages/kit/src/core/config/test/index.js
index 7da070eec9b04..f419984a7736e 100644
--- a/packages/kit/src/core/config/test/index.js
+++ b/packages/kit/src/core/config/test/index.js
@@ -36,7 +36,7 @@ test('load default config (esm)', async () => {
 				protocol: null
 			},
 			host: null,
-			hydrate: null,
+			hydrate: true,
 			inlineStyleThreshold: 0,
 			methodOverride: {
 				parameter: '_method',
diff --git a/packages/kit/src/runtime/server/index.js b/packages/kit/src/runtime/server/index.js
index c2ba63a32e38c..3883d399244df 100644
--- a/packages/kit/src/runtime/server/index.js
+++ b/packages/kit/src/runtime/server/index.js
@@ -83,7 +83,7 @@ export async function respond(incoming, options, state = {}) {
 	print_error('query', 'searchParams');
 
 	const resolve_opts = {
-		hydrate: true,
+		hydrate: options.hydrate,
 		router: true,
 		ssr: true
 	};
@@ -92,7 +92,8 @@ export async function respond(incoming, options, state = {}) {
 		return await options.hooks.handle({
 			request,
 			resolve: async (request, opts) => {
-				if (opts && 'hydrate' in opts) resolve_opts.hydrate = /** @type {boolean} */ (opts.hydrate);
+				if (resolve_opts.hydrate && opts && 'hydrate' in opts)
+					resolve_opts.hydrate = /** @type {boolean} */ (opts.hydrate);
 				if (opts && 'router' in opts) resolve_opts.router = /** @type {boolean} */ (opts.router);
 				if (opts && 'ssr' in opts) resolve_opts.ssr = /** @type {boolean} */ (opts.ssr);