feat: use typescript-eslint@v6's reworked configs (#7425)

9 files changed, 10 insertions, 21 deletions

diff --git a/packages/integrations/image/src/build/ssg.ts b/packages/integrations/image/src/build/ssg.ts
index 2a6976d76..4a6d84d53 100644
--- a/packages/integrations/image/src/build/ssg.ts
+++ b/packages/integrations/image/src/build/ssg.ts
@@ -162,7 +162,6 @@ export async function ssgBuild({
 		}
 
 		if (!inputBuffer) {
-			// eslint-disable-next-line no-console
 			warn({ level: logLevel, message: `"${src}" image could not be fetched` });
 			return;
 		}
diff --git a/packages/integrations/image/src/lib/get-image.ts b/packages/integrations/image/src/lib/get-image.ts
index d6aae4665..37f6a3bc4 100644
--- a/packages/integrations/image/src/lib/get-image.ts
+++ b/packages/integrations/image/src/lib/get-image.ts
@@ -1,10 +1,5 @@
 /// <reference types="astro/astro-jsx" />
-import type {
-	ColorDefinition,
-	ImageService,
-	OutputFormat,
-	TransformOptions,
-} from '../loaders/index.js';
+import type { ImageService, OutputFormat, TransformOptions } from '../loaders/index.js';
 import { isSSRService, parseAspectRatio } from '../loaders/index.js';
 import { isRemoteImage } from '../utils/paths.js';
 import type { ImageMetadata } from '../vite-plugin-astro-image.js';
@@ -91,7 +86,7 @@ async function resolveTransform(input: GetImageTransform): Promise<TransformOpti
 		height,
 		aspectRatio,
 		format: format as OutputFormat,
-		background: background as ColorDefinition | undefined,
+		background,
 	};
 }
 
diff --git a/packages/integrations/image/src/loaders/squoosh.ts b/packages/integrations/image/src/loaders/squoosh.ts
index b91b05be0..16eed032a 100644
--- a/packages/integrations/image/src/loaders/squoosh.ts
+++ b/packages/integrations/image/src/loaders/squoosh.ts
@@ -35,7 +35,7 @@ class SquooshService extends BaseSSRService {
 		};
 	}
 
-	async processPng(image: any, transform: TransformOptions) {
+	async processPng(image: any) {
 		await image.encode({ oxipng: {} });
 		const data = await image.encodedWith.oxipng;
 
diff --git a/packages/integrations/image/src/utils/colornames.ts b/packages/integrations/image/src/utils/colornames.ts
index 806e55f31..897ada1e5 100644
--- a/packages/integrations/image/src/utils/colornames.ts
+++ b/packages/integrations/image/src/utils/colornames.ts
@@ -70,7 +70,6 @@ export type NamedColor =
 	| 'lightgreen'
 	| 'lightpink'
 	| 'lightsalmon'
-	| 'lightsalmon'
 	| 'lightseagreen'
 	| 'lightskyblue'
 	| 'lightslategray'
@@ -87,7 +86,6 @@ export type NamedColor =
 	| 'mediumpurple'
 	| 'mediumseagreen'
 	| 'mediumslateblue'
-	| 'mediumslateblue'
 	| 'mediumspringgreen'
 	| 'mediumturquoise'
 	| 'mediumvioletred'
diff --git a/packages/integrations/image/src/vendor/squoosh/codecs.ts b/packages/integrations/image/src/vendor/squoosh/codecs.ts
index eb83df97d..aa751387e 100644
--- a/packages/integrations/image/src/vendor/squoosh/codecs.ts
+++ b/packages/integrations/image/src/vendor/squoosh/codecs.ts
@@ -287,7 +287,6 @@ export const codecs = {
   avif: {
     name: 'AVIF',
     extension: 'avif',
-    // eslint-disable-next-line no-control-regex
     detectors: [/^\x00\x00\x00 ftypavif\x00\x00\x00\x00/],
     dec: () =>
       instantiateEmscriptenWasm(avifDec as DecodeModuleFactory, avifDecWasm),
@@ -318,7 +317,6 @@ export const codecs = {
   oxipng: {
     name: 'OxiPNG',
     extension: 'png',
-    // eslint-disable-next-line no-control-regex
     detectors: [/^\x89PNG\x0D\x0A\x1A\x0A/],
     dec: async () => {
       await pngEncDecInit()
diff --git a/packages/integrations/image/src/vendor/squoosh/image.ts b/packages/integrations/image/src/vendor/squoosh/image.ts
index aad4fb598..c8862f0c4 100644
--- a/packages/integrations/image/src/vendor/squoosh/image.ts
+++ b/packages/integrations/image/src/vendor/squoosh/image.ts
@@ -29,14 +29,14 @@ export async function processBuffer(
 
 	switch (encoding) {
 		case 'avif':
-			return await impl.encodeAvif(imageData, { quality }) as Uint8Array;
+			return await impl.encodeAvif(imageData, { quality });
 		case 'jpeg':
 		case 'jpg':
-			return await impl.encodeJpeg(imageData, { quality }) as Uint8Array;
+			return await impl.encodeJpeg(imageData, { quality });
 		case 'png':
-			return await impl.encodePng(imageData) as Uint8Array;
+			return await impl.encodePng(imageData);
 		case 'webp':
-			return await impl.encodeWebp(imageData, { quality }) as Uint8Array;
+			return await impl.encodeWebp(imageData, { quality });
 		default:
 			throw Error(`Unsupported encoding format`)
 	}
diff --git a/packages/integrations/image/test/background-color-image-ssg.test.js b/packages/integrations/image/test/background-color-image-ssg.test.js
index 6c4423615..ea55d7ae1 100644
--- a/packages/integrations/image/test/background-color-image-ssg.test.js
+++ b/packages/integrations/image/test/background-color-image-ssg.test.js
@@ -50,7 +50,7 @@ describe('SSG image with background - dev', function () {
 		it(title, async () => {
 			const image = $(id);
 			const src = image.attr('src');
-			const [_, params] = src.split('?');
+			const [, params] = src.split('?');
 			const searchParams = new URLSearchParams(params);
 			expect(searchParams.get('bg')).to.equal(bg);
 		});
diff --git a/packages/integrations/image/test/background-color-image-ssr.test.js b/packages/integrations/image/test/background-color-image-ssr.test.js
index 6bc5f333f..66b512e30 100644
--- a/packages/integrations/image/test/background-color-image-ssr.test.js
+++ b/packages/integrations/image/test/background-color-image-ssr.test.js
@@ -104,7 +104,7 @@ describe('SSR image with background', function () {
 
 			const image = $(id);
 			const src = image.attr('src');
-			const [_, params] = src.split('?');
+			const [, params] = src.split('?');
 
 			const searchParams = new URLSearchParams(params);
 
diff --git a/packages/integrations/image/test/test-utils.js b/packages/integrations/image/test/test-utils.js
index e6c22e0ab..122e90132 100644
--- a/packages/integrations/image/test/test-utils.js
+++ b/packages/integrations/image/test/test-utils.js
@@ -1,8 +1,7 @@
 import { loadFixture as baseLoadFixture } from '../../../astro/test/test-utils.js';
 
 export function loadFixture(inlineConfig) {
-	if (!inlineConfig || !inlineConfig.root)
-		throw new Error("Must provide { root: './fixtures/...' }");
+	if (!inlineConfig?.root) throw new Error("Must provide { root: './fixtures/...' }");
 
 	// resolve the relative root (i.e. "./fixtures/tailwindcss") to a full filepath
 	// without this, the main `loadFixture` helper will resolve relative to `packages/astro/test`