From 2979590c959436e9147dbe93133920f6946628e0 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Wed, 31 Aug 2022 13:29:25 -0400
Subject: [PATCH] setup

---
 .../apps/basics/src/routes/+layout.svelte     | 22 +++--------------
 .../apps/dev-only/src/routes/+layout.svelte   |  7 ++++++
 .../apps/options-2/src/routes/+layout.svelte  |  7 ++++++
 .../apps/options/source/pages/+layout.svelte  | 20 ++--------------
 .../apps/writes/src/routes/+layout.svelte     |  7 ++++++
 packages/kit/test/setup.js                    | 24 +++++++++++++++++++
 6 files changed, 50 insertions(+), 37 deletions(-)
 create mode 100644 packages/kit/test/apps/dev-only/src/routes/+layout.svelte
 create mode 100644 packages/kit/test/apps/options-2/src/routes/+layout.svelte
 create mode 100644 packages/kit/test/apps/writes/src/routes/+layout.svelte
 create mode 100644 packages/kit/test/setup.js

diff --git a/packages/kit/test/apps/basics/src/routes/+layout.svelte b/packages/kit/test/apps/basics/src/routes/+layout.svelte
index b842834a6611..6272671c81ae 100644
--- a/packages/kit/test/apps/basics/src/routes/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/+layout.svelte
@@ -1,26 +1,10 @@
 <script>
-	import {
-		goto,
-		invalidate,
-		prefetch,
-		prefetchRoutes,
-		beforeNavigate,
-		afterNavigate
-	} from '$app/navigation';
-
-	if (typeof window !== 'undefined') {
-		Object.assign(window, {
-			goto,
-			invalidate,
-			prefetch,
-			prefetchRoutes,
-			beforeNavigate,
-			afterNavigate
-		});
-	}
+	import { setup } from '../../../../setup.js';
 
 	/** @type {import('./$types').LayoutData} */
 	export let data;
+
+	setup();
 </script>
 
 <slot />
diff --git a/packages/kit/test/apps/dev-only/src/routes/+layout.svelte b/packages/kit/test/apps/dev-only/src/routes/+layout.svelte
new file mode 100644
index 000000000000..5e1f1fed86c2
--- /dev/null
+++ b/packages/kit/test/apps/dev-only/src/routes/+layout.svelte
@@ -0,0 +1,7 @@
+<script>
+	import { setup } from '../../../../setup.js';
+
+	setup();
+</script>
+
+<slot />
diff --git a/packages/kit/test/apps/options-2/src/routes/+layout.svelte b/packages/kit/test/apps/options-2/src/routes/+layout.svelte
new file mode 100644
index 000000000000..5e1f1fed86c2
--- /dev/null
+++ b/packages/kit/test/apps/options-2/src/routes/+layout.svelte
@@ -0,0 +1,7 @@
+<script>
+	import { setup } from '../../../../setup.js';
+
+	setup();
+</script>
+
+<slot />
diff --git a/packages/kit/test/apps/options/source/pages/+layout.svelte b/packages/kit/test/apps/options/source/pages/+layout.svelte
index 030845a5d806..5e1f1fed86c2 100644
--- a/packages/kit/test/apps/options/source/pages/+layout.svelte
+++ b/packages/kit/test/apps/options/source/pages/+layout.svelte
@@ -1,23 +1,7 @@
 <script>
-	import {
-		goto,
-		invalidate,
-		prefetch,
-		prefetchRoutes,
-		beforeNavigate,
-		afterNavigate
-	} from '$app/navigation';
+	import { setup } from '../../../../setup.js';
 
-	if (typeof window !== 'undefined') {
-		Object.assign(window, {
-			goto,
-			invalidate,
-			prefetch,
-			prefetchRoutes,
-			beforeNavigate,
-			afterNavigate
-		});
-	}
+	setup();
 </script>
 
 <slot />
diff --git a/packages/kit/test/apps/writes/src/routes/+layout.svelte b/packages/kit/test/apps/writes/src/routes/+layout.svelte
new file mode 100644
index 000000000000..5e1f1fed86c2
--- /dev/null
+++ b/packages/kit/test/apps/writes/src/routes/+layout.svelte
@@ -0,0 +1,7 @@
+<script>
+	import { setup } from '../../../../setup.js';
+
+	setup();
+</script>
+
+<slot />
diff --git a/packages/kit/test/setup.js b/packages/kit/test/setup.js
new file mode 100644
index 000000000000..68ce5230a683
--- /dev/null
+++ b/packages/kit/test/setup.js
@@ -0,0 +1,24 @@
+import {
+	goto,
+	invalidate,
+	prefetch,
+	prefetchRoutes,
+	beforeNavigate,
+	afterNavigate
+} from '$app/navigation';
+import { onMount } from 'svelte';
+
+export function setup() {
+	onMount(() => {
+		Object.assign(window, {
+			goto,
+			invalidate,
+			prefetch,
+			prefetchRoutes,
+			beforeNavigate,
+			afterNavigate
+		});
+
+		document.body.classList.add('started');
+	});
+}