Merge branch 'main' of github.com:sveltejs/learn.svelte.dev

Rich Harris · Rich Harris · commit c34a754ee8ea · 2023-04-04T19:01:30.000-04:00
diff --git a/content/tutorial/01-svelte/08-stores/02-auto-subscriptions/README.md b/content/tutorial/01-svelte/08-stores/02-auto-subscriptions/README.md
@@ -15,7 +15,7 @@ Start by declaring `unsubscribe` in `App.svelte`:
 
 > Calling a `subscribe` method returns an `unsubscribe` function.
 
-You now declared `unsubscribe`, but it still needs to be called, for example through the `onDestroy` [lifecycle hook](/tutorial/ondestroy):
+You now declared `unsubscribe`, but it still needs to be called, for example through the `onDestroy` lifecycle hook:
 
 ```svelte
 /// file: App.svelte
diff --git a/content/tutorial/04-advanced-sveltekit/03-advanced-routing/04-route-groups/README.md b/content/tutorial/04-advanced-sveltekit/03-advanced-routing/04-route-groups/README.md
@@ -16,7 +16,7 @@ import { redirect } from '@sveltejs/kit';
 
 export function load({ cookies, url }) {
 	if (!cookies.get('logged_in')) {
-		throw redirect(307, `/login?redirectTo=${url.pathname}`);
+		throw redirect(303, `/login?redirectTo=${url.pathname}`);
 	}
 }
 ```
diff --git a/content/tutorial/04-advanced-sveltekit/03-advanced-routing/04-route-groups/app-a/src/routes/login/+page.server.js b/content/tutorial/04-advanced-sveltekit/03-advanced-routing/04-route-groups/app-a/src/routes/login/+page.server.js
@@ -3,6 +3,6 @@ import { redirect } from '@sveltejs/kit';
 export const actions = {
 	default: ({ cookies, url }) => {
 		cookies.set('logged_in', 'true', { path: '/' });
-		throw redirect(307, url.searchParams.get('redirectTo') ?? '/');
+		throw redirect(303, url.searchParams.get('redirectTo') ?? '/');
 	}
 };
diff --git a/content/tutorial/04-advanced-sveltekit/03-advanced-routing/04-route-groups/app-a/src/routes/logout/+page.server.js b/content/tutorial/04-advanced-sveltekit/03-advanced-routing/04-route-groups/app-a/src/routes/logout/+page.server.js
@@ -3,6 +3,6 @@ import { redirect } from '@sveltejs/kit';
 export const actions = {
 	default: ({ cookies }) => {
 		cookies.delete('logged_in', { path: '/' });
-		throw redirect(307, '/');
+		throw redirect(303, '/');
 	}
 };
diff --git a/content/tutorial/04-advanced-sveltekit/03-advanced-routing/04-route-groups/app-b/src/routes/(authed)/+layout.server.js b/content/tutorial/04-advanced-sveltekit/03-advanced-routing/04-route-groups/app-b/src/routes/(authed)/+layout.server.js
@@ -2,6 +2,6 @@ import { redirect } from '@sveltejs/kit';
 
 export function load({ cookies, url }) {
 	if (!cookies.get('logged_in')) {
-		throw redirect(307, `/login?redirectTo=${url.pathname}`);
+		throw redirect(303, `/login?redirectTo=${url.pathname}`);
 	}
 }
diff --git a/content/tutorial/common/src/__client.js b/content/tutorial/common/src/__client.js
@@ -1,19 +1,3 @@
-// Hack into the alert that's used in some tutorials and send a message prior to the alert,
-// else the parent thinks we lost contact and wrongfully reloads the page.
-// The drawback is that alert is no longer blocking, but no tutorial relies on this.
-const alert = window.alert;
-window.alert = (message) => {
-	parent.postMessage(
-		{
-			type: 'ping-pause'
-		},
-		'*'
-	);
-	setTimeout(() => {
-		alert(message);
-	});
-};
-
 window.addEventListener('message', async (e) => {
 	if (e.data.type === 'fetch') {
 		const names = e.data.names;
@@ -121,7 +105,6 @@ function ping() {
 	);
 }
 
-setInterval(ping, 100);
 ping();
 
 if (import.meta.hot) {
diff --git a/src/routes/tutorial/[slug]/Output.svelte b/src/routes/tutorial/[slug]/Output.svelte
@@ -34,34 +34,14 @@
 		};
 	});
 
-	afterNavigate(() => {
-		clearTimeout(timeout);
-	});
-
-	/** @type {any} */
-	let timeout;
-
 	/** @param {MessageEvent} e */
 	async function handle_message(e) {
 		if (e.origin !== $base) return;
 
 		if (paused) return;
 
 		if (e.data.type === 'ping') {
-			path = e.data.data.path ?? path;
 			loading = false;
-
-			clearTimeout(timeout);
-			timeout = setTimeout(() => {
-				if (dev && !iframe) return;
-
-				// we lost contact, refresh the page
-				loading = true;
-				set_iframe_src($base + path);
-				loading = false;
-			}, 1000);
-		} else if (e.data.type === 'ping-pause') {
-			clearTimeout(timeout);
 		} else if (e.data.type === 'warnings') {
 			warnings.update(($warnings) => ({
 				...$warnings,

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ import { redirect } from '@sveltejs/kit';`
`16`	`16`
`17`	`17`	`export function load({ cookies, url }) {`
`18`	`18`	`if (!cookies.get('logged_in')) {`
`19`		- throw redirect(307, `/login?redirectTo=${url.pathname}`);
	`19`	+ throw redirect(303, `/login?redirectTo=${url.pathname}`);
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`	```
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@ import { redirect } from '@sveltejs/kit';`
`3`	`3`	`export const actions = {`
`4`	`4`	`default: ({ cookies, url }) => {`
`5`	`5`	`cookies.set('logged_in', 'true', { path: '/' });`
`6`		`- throw redirect(307, url.searchParams.get('redirectTo') ?? '/');`
	`6`	`+ throw redirect(303, url.searchParams.get('redirectTo') ?? '/');`
`7`	`7`	`}`
`8`	`8`	`};`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@ import { redirect } from '@sveltejs/kit';`
`3`	`3`	`export const actions = {`
`4`	`4`	`default: ({ cookies }) => {`
`5`	`5`	`cookies.delete('logged_in', { path: '/' });`
`6`		`- throw redirect(307, '/');`
	`6`	`+ throw redirect(303, '/');`
`7`	`7`	`}`
`8`	`8`	`};`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@ import { redirect } from '@sveltejs/kit';`
`2`	`2`
`3`	`3`	`export function load({ cookies, url }) {`
`4`	`4`	`if (!cookies.get('logged_in')) {`
`5`		- throw redirect(307, `/login?redirectTo=${url.pathname}`);
	`5`	+ throw redirect(303, `/login?redirectTo=${url.pathname}`);
`6`	`6`	`}`
`7`	`7`	`}`