address some no-floating-promises issues

benmccann · benmccann · commit 743c640971c2 · 2024-06-03T18:52:30.000-07:00
diff --git a/packages/adapter-node/src/handler.js b/packages/adapter-node/src/handler.js
@@ -105,7 +105,7 @@ const ssr = async (req, res) => {
 		return;
 	}
 
-	setResponse(
+	await setResponse(
 		res,
 		await server.respond(request, {
 			platform: { req },
diff --git a/packages/adapter-vercel/files/serverless.js b/packages/adapter-vercel/files/serverless.js
@@ -35,7 +35,7 @@ export default async (req, res) => {
 
 	const request = await getRequest({ base: `https://${req.headers.host}`, request: req });
 
-	setResponse(
+	await setResponse(
 		res,
 		await server.respond(request, {
 			getClientAddress() {
diff --git a/packages/create-svelte/scripts/build-templates.js b/packages/create-svelte/scripts/build-templates.js
@@ -305,4 +305,4 @@ async function main() {
 	await generate_templates(shared);
 }
 
-main();
+await main();
diff --git a/packages/create-svelte/test/check.js b/packages/create-svelte/test/check.js
@@ -108,7 +108,7 @@ for (const template of templates) {
 		const cwd = path.join(test_workspace_dir, `${template}-${types}`);
 		fs.rmSync(cwd, { recursive: true, force: true });
 
-		create(cwd, {
+		await create(cwd, {
 			name: `create-svelte-test-${template}-${types}`,
 			template,
 			types,
diff --git a/packages/enhanced-img/test/preprocessor.spec.js b/packages/enhanced-img/test/preprocessor.spec.js
@@ -32,7 +32,7 @@ it('Image preprocess snapshot test', async () => {
 	// Make imports readable
 	const ouput = processed.code.replace(/import/g, '\n\timport');
 
-	expect(ouput).toMatchFileSnapshot('./Output.svelte');
+	await expect(ouput).toMatchFileSnapshot('./Output.svelte');
 });
 
 it('parses a minimized object', () => {
diff --git a/packages/kit/src/core/postbuild/prerender.js b/packages/kit/src/core/postbuild/prerender.js
@@ -233,7 +233,7 @@ async function prerender({ out, manifest_path, metadata, verbose, env }) {
 
 		const body = Buffer.from(await response.arrayBuffer());
 
-		save('pages', response, body, decoded, encoded, referrer, 'linked');
+		await save('pages', response, body, decoded, encoded, referrer, 'linked');
 
 		for (const [dependency_path, result] of dependencies) {
 			// this seems circuitous, but using new URL allows us to not care
@@ -257,7 +257,7 @@ async function prerender({ out, manifest_path, metadata, verbose, env }) {
 
 			const body = result.body ?? new Uint8Array(await result.response.arrayBuffer());
 
-			save(
+			await save(
 				'dependencies',
 				result.response,
 				body,
@@ -305,7 +305,7 @@ async function prerender({ out, manifest_path, metadata, verbose, env }) {
 					/** @type {Set<string>} */ (expected_hashlinks.get(key)).add(decoded);
 				}
 
-				enqueue(decoded, decode_uri(pathname), pathname);
+				await enqueue(decoded, decode_uri(pathname), pathname);
 			}
 		}
 	}
@@ -319,7 +319,7 @@ async function prerender({ out, manifest_path, metadata, verbose, env }) {
 	 * @param {string | null} referrer
 	 * @param {'linked' | 'fetched'} referenceType
 	 */
-	function save(category, response, body, decoded, encoded, referrer, referenceType) {
+	async function save(category, response, body, decoded, encoded, referrer, referenceType) {
 		const response_type = Math.floor(response.status / 100);
 		const headers = Object.fromEntries(response.headers);
 
@@ -341,7 +341,7 @@ async function prerender({ out, manifest_path, metadata, verbose, env }) {
 			if (location) {
 				const resolved = resolve(encoded, location);
 				if (is_root_relative(resolved)) {
-					enqueue(decoded, decode_uri(resolved), resolved);
+					await enqueue(decoded, decode_uri(resolved), resolved);
 				}
 
 				if (!headers['x-sveltekit-normalize']) {
@@ -459,17 +459,17 @@ async function prerender({ out, manifest_path, metadata, verbose, env }) {
 
 					if (processed_id.includes('[')) continue;
 					const path = `/${get_route_segments(processed_id).join('/')}`;
-					enqueue(null, config.paths.base + path);
+					await enqueue(null, config.paths.base + path);
 				}
 			}
 		} else {
-			enqueue(null, config.paths.base + entry);
+			await enqueue(null, config.paths.base + entry);
 		}
 	}
 
 	for (const { id, entries } of route_level_entries) {
 		for (const entry of entries) {
-			enqueue(null, config.paths.base + entry, undefined, id);
+			await enqueue(null, config.paths.base + entry, undefined, id);
 		}
 	}
 
diff --git a/packages/kit/src/exports/vite/dev/index.js b/packages/kit/src/exports/vite/dev/index.js
@@ -377,7 +377,7 @@ export async function dev(vite, vite_config, svelte_config) {
 			SvelteKitError: control_module_vite.SvelteKitError
 		});
 	}
-	align_exports();
+	await align_exports();
 	const ws_send = vite.ws.send;
 	/** @param {any} args */
 	vite.ws.send = function (...args) {
@@ -540,7 +540,7 @@ export async function dev(vite, vite_config, svelte_config) {
 						setResponse(res, rendered);
 					});
 				} else {
-					setResponse(res, rendered);
+					await setResponse(res, rendered);
 				}
 			} catch (e) {
 				const error = coalesce_to_error(e);
diff --git a/packages/kit/src/runtime/app/forms.js b/packages/kit/src/runtime/app/forms.js
@@ -104,7 +104,7 @@ export function enhance(form_element, submit = () => {}) {
 			result.type === 'redirect' ||
 			result.type === 'error'
 		) {
-			applyAction(result);
+			await applyAction(result);
 		}
 	};
 
@@ -179,7 +179,7 @@ export function enhance(form_element, submit = () => {}) {
 			result = { type: 'error', error };
 		}
 
-		callback({
+		await callback({
 			action,
 			formData: form_data,
 			formElement: form_element,
diff --git a/packages/kit/src/runtime/client/client.js b/packages/kit/src/runtime/client/client.js
@@ -259,8 +259,8 @@ export async function start(_app, _target, hydrate) {
 	// connectivity errors after initialisation don't nuke the app
 	default_layout_loader = _app.nodes[0];
 	default_error_loader = _app.nodes[1];
-	default_layout_loader();
-	default_error_loader();
+	await default_layout_loader();
+	await default_error_loader();
 
 	current_history_index = history.state?.[HISTORY_INDEX];
 	current_navigation_index = history.state?.[NAVIGATION_INDEX];
@@ -292,7 +292,7 @@ export async function start(_app, _target, hydrate) {
 	if (hydrate) {
 		await _hydrate(target, hydrate);
 	} else {
-		goto(location.href, { replaceState: true });
+		await goto(location.href, { replaceState: true });
 	}
 
 	_start_router();
@@ -1319,7 +1319,7 @@ async function navigate({
 				route: { id: null }
 			});
 		} else {
-			_goto(new URL(navigation_result.location, url).href, {}, redirect_count + 1, nav_token);
+			await _goto(new URL(navigation_result.location, url).href, {}, redirect_count + 1, nav_token);
 			return false;
 		}
 	} else if (/** @type {number} */ (navigation_result.props.page.status) >= 400) {
@@ -1517,10 +1517,10 @@ function setup_preload() {
 	container.addEventListener('touchstart', tap, { passive: true });
 
 	const observer = new IntersectionObserver(
-		(entries) => {
+		async (entries) => {
 			for (const entry of entries) {
 				if (entry.isIntersecting) {
-					_preload_code(/** @type {HTMLAnchorElement} */ (entry.target).href);
+					await _preload_code(/** @type {HTMLAnchorElement} */ (entry.target).href);
 					observer.unobserve(entry.target);
 				}
 			}
@@ -1950,7 +1950,7 @@ export async function applyAction(result) {
 			tick().then(reset_focus);
 		}
 	} else if (result.type === 'redirect') {
-		_goto(result.location, { invalidateAll: true }, 0);
+		await _goto(result.location, { invalidateAll: true }, 0);
 	} else {
 		/** @type {Record<string, any>} */
 		root.$set({
@@ -2122,7 +2122,7 @@ function _start_router() {
 			setTimeout(fulfil, 100); // fallback for edge case where rAF doesn't fire because e.g. tab was backgrounded
 		});
 
-		navigate({
+		await navigate({
 			type: 'link',
 			url,
 			keepfocus: options.keepfocus,
diff --git a/packages/kit/src/runtime/server/page/load_data.spec.js b/packages/kit/src/runtime/server/page/load_data.spec.js
@@ -47,10 +47,10 @@ test('succeeds when acao header present on cors', async () => {
 	assert.equal(text, 'foo');
 });
 
-test('errors when no acao header present on cors', () => {
+test('errors when no acao header present on cors', async () => {
 	const fetch = create_fetch({});
 
-	expect(async () => {
+	await expect(async () => {
 		const response = await fetch('https://domain-b.com');
 		await response.text();
 	}).rejects.toThrowError(
diff --git a/packages/kit/src/utils/streaming.spec.js b/packages/kit/src/utils/streaming.spec.js
@@ -1,12 +1,13 @@
 import { expect, test } from 'vitest';
 import { create_async_iterator } from './streaming.js';
+import { fail } from 'node:assert';
 
 test('works with fast consecutive promise resolutions', async () => {
 	const iterator = create_async_iterator();
 
-	Promise.resolve(1).then((n) => iterator.push(n));
-	Promise.resolve(2).then((n) => iterator.push(n));
-	Promise.resolve().then(() => iterator.done());
+	Promise.resolve(1).then((n) => iterator.push(n)).catch(fail);
+	Promise.resolve(2).then((n) => iterator.push(n)).catch(fail);
+	Promise.resolve().then(() => iterator.done()).catch(fail);
 
 	const actual = [];
 	for await (const value of iterator.iterator) {
diff --git a/packages/kit/test/utils.js b/packages/kit/test/utils.js
@@ -5,9 +5,9 @@ import { fileURLToPath } from 'node:url';
 import { test as base, devices } from '@playwright/test';
 
 export const test = base.extend({
-	app: ({ page }, use) => {
+	app: async ({ page }, use) => {
 		// these are assumed to have been put in the global scope by the layout
-		use({
+		await use({
 			/**
 			 * @param {string} url
 			 * @param {{ replaceState?: boolean }} opts
@@ -52,7 +52,7 @@ export const test = base.extend({
 		});
 	},
 
-	clicknav: ({ page, javaScriptEnabled }, use) => {
+	clicknav: async ({ page, javaScriptEnabled }, use) => {
 		/**
 		 * @param {string} selector
 		 * @param {{ timeout: number }} options
@@ -66,18 +66,18 @@ export const test = base.extend({
 			}
 		}
 
-		use(clicknav);
+		await use(clicknav);
 	},
 
-	in_view: ({ page }, use) => {
+	in_view: async ({ page }, use) => {
 		/** @param {string} selector */
 		async function in_view(selector) {
 			const box = await page.locator(selector).boundingBox();
 			const view = page.viewportSize();
 			return box && view && box.y < view.height && box.y + box.height > 0;
 		}
 
-		use(in_view);
+		await use(in_view);
 	},
 
 	get_computed_style: async ({ page }, use) => {
@@ -119,7 +119,7 @@ export const test = base.extend({
 	},
 
 	// eslint-disable-next-line no-empty-pattern
-	read_errors: ({}, use) => {
+	read_errors: async ({}, use) => {
 		/** @param {string} path */
 		function read_errors(path) {
 			const errors =
@@ -128,7 +128,7 @@ export const test = base.extend({
 			return errors[path];
 		}
 
-		use(read_errors);
+		await use(read_errors);
 	},
 
 	// eslint-disable-next-line no-empty-pattern
diff --git a/packages/package/test/index.js b/packages/package/test/index.js
@@ -227,7 +227,7 @@ if (!process.env.CI) {
 			await settled();
 			compare('post-error.svelte');
 		} finally {
-			watcher.close();
+			await watcher.close();
 
 			remove('src/lib/Test.svelte');
 			remove('src/lib/a.js');

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ const ssr = async (req, res) => {`
`105`	`105`	`return;`
`106`	`106`	`}`
`107`	`107`
`108`		`- setResponse(`
	`108`	`+ await setResponse(`
`109`	`109`	`res,`
`110`	`110`	`await server.respond(request, {`
`111`	`111`	`platform: { req },`
Original file line number	Diff line number	Diff line change
`@@ -305,4 +305,4 @@ async function main() {`
`305`	`305`	`await generate_templates(shared);`
`306`	`306`	`}`
`307`	`307`
`308`		`-main();`
	`308`	`+await main();`
Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ async function prerender({ out, manifest_path, metadata, verbose, env }) {`
`233`	`233`
`234`	`234`	`const body = Buffer.from(await response.arrayBuffer());`
`235`	`235`
`236`		`- save('pages', response, body, decoded, encoded, referrer, 'linked');`
	`236`	`+ await save('pages', response, body, decoded, encoded, referrer, 'linked');`
`237`	`237`
`238`	`238`	`for (const [dependency_path, result] of dependencies) {`
`239`	`239`	`// this seems circuitous, but using new URL allows us to not care`
`@@ -257,7 +257,7 @@ async function prerender({ out, manifest_path, metadata, verbose, env }) {`
`257`	`257`
`258`	`258`	`const body = result.body ?? new Uint8Array(await result.response.arrayBuffer());`
`259`	`259`
`260`		`- save(`
	`260`	`+ await save(`
`261`	`261`	`'dependencies',`
`262`	`262`	`result.response,`
`263`	`263`	`body,`
`@@ -305,7 +305,7 @@ async function prerender({ out, manifest_path, metadata, verbose, env }) {`
`305`	`305`	`/** @type {Set<string>} */ (expected_hashlinks.get(key)).add(decoded);`
`306`	`306`	`}`
`307`	`307`
`308`		`- enqueue(decoded, decode_uri(pathname), pathname);`
	`308`	`+ await enqueue(decoded, decode_uri(pathname), pathname);`
`309`	`309`	`}`
`310`	`310`	`}`
`311`	`311`	`}`
`@@ -319,7 +319,7 @@ async function prerender({ out, manifest_path, metadata, verbose, env }) {`
`319`	`319`	`* @param {string \| null} referrer`
`320`	`320`	`* @param {'linked' \| 'fetched'} referenceType`
`321`	`321`	`*/`
`322`		`- function save(category, response, body, decoded, encoded, referrer, referenceType) {`
	`322`	`+ async function save(category, response, body, decoded, encoded, referrer, referenceType) {`
`323`	`323`	`const response_type = Math.floor(response.status / 100);`
`324`	`324`	`const headers = Object.fromEntries(response.headers);`
`325`	`325`
`@@ -341,7 +341,7 @@ async function prerender({ out, manifest_path, metadata, verbose, env }) {`
`341`	`341`	`if (location) {`
`342`	`342`	`const resolved = resolve(encoded, location);`
`343`	`343`	`if (is_root_relative(resolved)) {`
`344`		`- enqueue(decoded, decode_uri(resolved), resolved);`
	`344`	`+ await enqueue(decoded, decode_uri(resolved), resolved);`
`345`	`345`	`}`
`346`	`346`
`347`	`347`	`if (!headers['x-sveltekit-normalize']) {`
`@@ -459,17 +459,17 @@ async function prerender({ out, manifest_path, metadata, verbose, env }) {`
`459`	`459`
`460`	`460`	`if (processed_id.includes('[')) continue;`
`461`	`461`	const path = `/${get_route_segments(processed_id).join('/')}`;
`462`		`- enqueue(null, config.paths.base + path);`
	`462`	`+ await enqueue(null, config.paths.base + path);`
`463`	`463`	`}`
`464`	`464`	`}`
`465`	`465`	`} else {`
`466`		`- enqueue(null, config.paths.base + entry);`
	`466`	`+ await enqueue(null, config.paths.base + entry);`
`467`	`467`	`}`
`468`	`468`	`}`
`469`	`469`
`470`	`470`	`for (const { id, entries } of route_level_entries) {`
`471`	`471`	`for (const entry of entries) {`
`472`		`- enqueue(null, config.paths.base + entry, undefined, id);`
	`472`	`+ await enqueue(null, config.paths.base + entry, undefined, id);`
`473`	`473`	`}`
`474`	`474`	`}`
`475`	`475`