chore: cleanup promise handling (#12297)

Co-authored-by: Ben McCann <[email protected]>

Author: Rich-Harris

.changeset/modern-deers-grab.md

@@ -0,0 +1,5 @@
+---
+'@sveltejs/enhanced-img': minor
+---
+
+breaking: return plugin synchronously from `enhancedImages()`

eslint.config.js

@@ -4,8 +4,15 @@ import svelte_config from '@sveltejs/eslint-config';
 export default [
 	...svelte_config,
 	{
+		languageOptions: {
+			parserOptions: {
+				project: true
+			}
+		},
 		rules: {
+			'@typescript-eslint/await-thenable': 'error',
 			'@typescript-eslint/no-unused-expressions': 'off',
+			'@typescript-eslint/require-await': 'error',
 			'no-undef': 'off'
 		}
 	},
@@ -15,7 +22,19 @@ export default [
 			'packages/adapter-static/test/apps/*/build',
 			'packages/adapter-cloudflare/files',
 			'packages/adapter-netlify/files',
-			'packages/adapter-node/files'
+			'packages/adapter-node/files',
+			// TODO: figure out if we can ignore these only for @typescript-eslint
+			'packages/adapter-node/rollup.config.js',
+			'packages/adapter-node/tests/smoke.spec.js',
+			'packages/adapter-static/test/apps',
+			'packages/create-svelte/shared',
+			'packages/create-svelte/templates',
+			'packages/kit/src/core/sync/create_manifest_data/test/samples',
+			'packages/kit/test/apps',
+			'packages/kit/test/build-errors',
+			'packages/kit/test/prerendering',
+			'packages/package/test/errors',
+			'packages/package/test/fixtures'
 		]
 	}
 ];

packages/adapter-auto/index.js

@@ -36,9 +36,9 @@ function detect_package_manager() {
 }
 
 /** @param {string} name */
-async function import_from_cwd(name) {
+function import_from_cwd(name) {
 	const cwd = pathToFileURL(process.cwd()).href;
-	const url = await resolve(name, cwd + '/x.js');
+	const url = resolve(name, cwd + '/x.js');
 
 	return import(url);
 }

packages/adapter-netlify/index.js

@@ -92,7 +92,7 @@ export default function ({ split = false, edge = edge_set_in_env_var } = {}) {
 
 				await generate_edge_functions({ builder });
 			} else {
-				await generate_lambda_functions({ builder, split, publish });
+				generate_lambda_functions({ builder, split, publish });
 			}
 		},
 
@@ -182,7 +182,7 @@ async function generate_edge_functions({ builder }) {
  * @param { string } params.publish
  * @param { boolean } params.split
  */
-async function generate_lambda_functions({ builder, publish, split }) {
+function generate_lambda_functions({ builder, publish, split }) {
 	builder.mkdirp('.netlify/functions-internal/.svelte-kit');
 
 	/** @type {string[]} */

packages/create-svelte/index.js

@@ -3,6 +3,7 @@ import path from 'node:path';
 import { mkdirp, copy, dist } from './utils.js';
 
 /** @type {import('./types/index.js').create} */
+// eslint-disable-next-line @typescript-eslint/require-await
 export async function create(cwd, options) {
 	mkdirp(cwd);
 

packages/enhanced-img/src/index.js

@@ -3,10 +3,10 @@ import { imagetools } from 'vite-imagetools';
 import { image } from './preprocessor.js';
 
 /**
- * @returns {Promise<import('vite').Plugin[]>}
+ * @returns {import('vite').Plugin[]}
  */
-export async function enhancedImages() {
-	const imagetools_instance = await imagetools_plugin();
+export function enhancedImages() {
+	const imagetools_instance = imagetools_plugin();
 	return !process.versions.webcontainer
 		? [image_plugin(imagetools_instance), imagetools_instance]
 		: [];
@@ -60,7 +60,7 @@ const fallback = {
 	'.webp': 'png'
 };
 
-async function imagetools_plugin() {
+function imagetools_plugin() {
 	/** @type {Partial<import('vite-imagetools').VitePluginOptions>} */
 	const imagetools_opts = {
 		defaultDirectives: async ({ pathname, searchParams: qs }, metadata) => {

packages/kit/postinstall.js

@@ -40,7 +40,7 @@ try {
 
 			try {
 				const config = await load_config();
-				await sync.all(config, 'development');
+				sync.all(config, 'development');
 			} catch (error) {
 				console.error('Error while trying to sync SvelteKit config');
 				console.error(error);

packages/kit/src/cli.js

@@ -35,7 +35,7 @@ prog
 		try {
 			const config = await load_config();
 			const sync = await import('./core/sync/sync.js');
-			await sync.all_types(config, mode);
+			sync.all_types(config, mode);
 		} catch (error) {
 			handle_error(error);
 		}

packages/kit/src/core/sync/sync.js

@@ -23,15 +23,15 @@ export function init(config, mode) {
  * Update SvelteKit's generated files
  * @param {import('types').ValidatedConfig} config
  */
-export async function create(config) {
+export function create(config) {
 	const manifest_data = create_manifest_data({ config });
 
 	const output = path.join(config.kit.outDir, 'generated');
 
 	write_client_manifest(config.kit, manifest_data, `${output}/client`);
 	write_server(config, output);
 	write_root(manifest_data, output);
-	await write_all_types(config, manifest_data);
+	write_all_types(config, manifest_data);
 
 	return { manifest_data };
 }
@@ -44,31 +44,29 @@ export async function create(config) {
  * @param {import('types').ManifestData} manifest_data
  * @param {string} file
  */
-export async function update(config, manifest_data, file) {
-	await write_types(config, manifest_data, file);
-
-	return { manifest_data };
+export function update(config, manifest_data, file) {
+	write_types(config, manifest_data, file);
 }
 
 /**
  * Run sync.init and sync.create in series, returning the result from sync.create.
  * @param {import('types').ValidatedConfig} config
  * @param {string} mode The Vite mode
  */
-export async function all(config, mode) {
+export function all(config, mode) {
 	init(config, mode);
-	return await create(config);
+	return create(config);
 }
 
 /**
  * Run sync.init and then generate all type files.
  * @param {import('types').ValidatedConfig} config
  * @param {string} mode The Vite mode
  */
-export async function all_types(config, mode) {
+export function all_types(config, mode) {
 	init(config, mode);
 	const manifest_data = create_manifest_data({ config });
-	await write_all_types(config, manifest_data);
+	write_all_types(config, manifest_data);
 }
 
 /**

packages/kit/src/core/sync/write_types/index.js

@@ -28,7 +28,7 @@ const cwd = process.cwd();
  * @param {import('types').ValidatedConfig} config
  * @param {import('types').ManifestData} manifest_data
  */
-export async function write_all_types(config, manifest_data) {
+export function write_all_types(config, manifest_data) {
 	if (!ts) return;
 
 	const types_dir = `${config.kit.outDir}/types`;
@@ -133,7 +133,7 @@ export async function write_all_types(config, manifest_data) {
  * @param {import('types').ManifestData} manifest_data
  * @param {string} file
  */
-export async function write_types(config, manifest_data, file) {
+export function write_types(config, manifest_data, file) {
 	if (!ts) return;
 
 	if (!path.basename(file).startsWith('+')) {