Remove sveltekit:start event (#6484)

* Remove sveltekit:start event Closes #6448 * setup * rename docs files * Update .changeset/perfect-cycles-smell.md * comments Co-authored-by: Gaurav Singh <allstargaurav@gmail.com>
sveltejs · Aug 31, 2022 · 70bc001 · 70bc001
1 parent cade00d
commit 70bc001
Show file tree

Hide file tree

Showing 19 changed files with 57 additions and 56 deletions.
diff --git a/.changeset/perfect-cycles-smell.md b/.changeset/perfect-cycles-smell.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+[breaking] Remove sveltekit:start event
diff --git a/documentation/docs/11-adapters.md → documentation/docs/10-adapters.md b/documentation/docs/11-adapters.md → documentation/docs/10-adapters.md
diff --git a/documentation/docs/10-events.md b/documentation/docs/10-events.md
diff --git a/documentation/docs/12-page-options.md → documentation/docs/11-page-options.md b/documentation/docs/12-page-options.md → documentation/docs/11-page-options.md
diff --git a/documentation/docs/13-packaging.md → documentation/docs/12-packaging.md b/documentation/docs/13-packaging.md → documentation/docs/12-packaging.md
diff --git a/documentation/docs/14-cli.md → documentation/docs/13-cli.md b/documentation/docs/14-cli.md → documentation/docs/13-cli.md
diff --git a/documentation/docs/15-configuration.md → documentation/docs/14-configuration.md b/documentation/docs/15-configuration.md → documentation/docs/14-configuration.md
diff --git a/documentation/docs/16-types.md → documentation/docs/15-types.md b/documentation/docs/16-types.md → documentation/docs/15-types.md
diff --git a/documentation/docs/17-seo.md → documentation/docs/16-seo.md b/documentation/docs/17-seo.md → documentation/docs/16-seo.md
diff --git a/documentation/docs/18-assets.md → documentation/docs/17-assets.md b/documentation/docs/18-assets.md → documentation/docs/17-assets.md
diff --git a/documentation/docs/19-accessibility.md → documentation/docs/18-accessibility.md b/documentation/docs/19-accessibility.md → documentation/docs/18-accessibility.md
diff --git a/packages/kit/src/runtime/client/start.js b/packages/kit/src/runtime/client/start.js
@@ -42,6 +42,4 @@ export async function start({ env, hydrate, paths, target, trailing_slash }) {
 	}
 
 	client._start_router();
-
-	dispatchEvent(new CustomEvent('sveltekit:start'));
 }
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -0,0 +1,26 @@
+import {
+	goto,
+	invalidate,
+	prefetch,
+	prefetchRoutes,
+	beforeNavigate,
+	afterNavigate
+} from '$app/navigation';
+import { onMount } from 'svelte';
+
+export function setup() {
+	onMount(() => {
+		// give tests programmatic control over the app
+		Object.assign(window, {
+			goto,
+			invalidate,
+			prefetch,
+			prefetchRoutes,
+			beforeNavigate,
+			afterNavigate
+		});
+
+		// communicate that the app is ready
+		document.body.classList.add('started');
+	});
+}
diff --git a/packages/kit/test/utils.js b/packages/kit/test/utils.js
@@ -78,16 +78,6 @@ export const test = base.extend({
 	},
 
 	page: async ({ page, javaScriptEnabled }, use) => {
-		if (javaScriptEnabled) {
-			page.addInitScript({
-				content: `
-					addEventListener('sveltekit:start', () => {
-						document.body.classList.add('started');
-					});
-				`
-			});
-		}
-
 		// automatically wait for kit started event after navigation functions if js is enabled
 		const page_navigation_functions = ['goto', 'goBack', 'reload'];
 		page_navigation_functions.forEach((fn) => {
-Original file line number
+Diff line change
@@ Expand Up @@
     	}
     	client._start_router();
-    	dispatchEvent(new CustomEvent('sveltekit:start'));
     }