restore app-level hydrate option

Author: benmccann

documentation/docs/14-configuration.md

@@ -31,6 +31,7 @@ const config = {
 			protocol: null
 		},
 		host: null,
+		hydrate: true,
 		inlineStyleThreshold: 0,
 		methodOverride: {
 			parameter: '_method',

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 },

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',

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),
 

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',

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,9 @@ 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);