chore: bump typescript-eslint to v8 (#11649)

withastro · Aug 8, 2024 · 4c1b769 · 4c1b769
1 parent 9aaf58c
commit 4c1b769
Show file tree

Hide file tree

Showing 74 changed files with 169 additions and 175 deletions.
diff --git a/eslint.config.js b/eslint.config.js
@@ -83,10 +83,13 @@ export default [
 			'@typescript-eslint/no-unsafe-assignment': 'off',
 			'@typescript-eslint/no-unsafe-call': 'off',
 			'@typescript-eslint/no-unsafe-member-access': 'off',
+			'@typescript-eslint/no-unused-expressions': 'off',
+			'@typescript-eslint/only-throw-error': 'off',
 			'@typescript-eslint/no-unsafe-return': 'off',
 			'@typescript-eslint/no-unnecessary-type-assertion': 'off',
 			'@typescript-eslint/prefer-nullish-coalescing': 'off',
 			'@typescript-eslint/prefer-optional-chain': 'off',
+			'@typescript-eslint/prefer-promise-reject-errors': 'off',
 			'@typescript-eslint/prefer-string-starts-ends-with': 'off',
 			'@typescript-eslint/require-await': 'off',
 			'@typescript-eslint/restrict-plus-operands': 'off',

diff --git a/package.json b/package.json
@@ -67,7 +67,7 @@
     "prettier-plugin-astro": "^0.14.1",
     "turbo": "^1.13.4",
     "typescript": "~5.5.4",
-    "typescript-eslint": "^7.18.0"
+    "typescript-eslint": "^8.0.1"
   },
   "pnpm": {
     "packageExtensions": {

diff --git a/packages/astro-rss/src/util.ts b/packages/astro-rss/src/util.ts
@@ -28,7 +28,7 @@ export function isValidURL(url: string): boolean {
 	try {
 		new URL(url);
 		return true;
-	} catch (e) {}
+	} catch {}
 	return false;
 }
 

diff --git a/packages/astro/astro-jsx.d.ts b/packages/astro/astro-jsx.d.ts
@@ -14,7 +14,6 @@ declare namespace astroHTML.JSX {
 	export type Children = Child | Child[];
 
 	interface ElementChildrenAttribute {
-		// eslint-disable-next-line @typescript-eslint/ban-types
 		children: {};
 	}
 

diff --git a/packages/astro/astro.js b/packages/astro/astro.js
@@ -52,6 +52,7 @@ async function errorNodeUnsupported() {
 Node.js v${process.versions.node} is not supported by Astro!
 Please upgrade Node.js to a supported version: "${engines}"\n`);
 
+	// eslint-disable-next-line @typescript-eslint/no-require-imports
 	const ci = typeof require !== 'undefined' ? require('ci-info') : await import('ci-info');
 
 	// Special instructions for CI environments, which may have special steps needed.

diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts
@@ -123,7 +123,7 @@ export type TransitionAnimationValue =
 	| TransitionDirectionalAnimations;
 
 // Allow users to extend this for astro-jsx.d.ts
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
+// eslint-disable-next-line @typescript-eslint/no-empty-object-type
 export interface AstroClientDirectives {}
 
 export interface AstroBuiltinAttributes {
@@ -459,7 +459,6 @@ export interface ViteUserConfig extends vite.UserConfig {
 }
 
 export interface ImageServiceConfig<T extends Record<string, any> = Record<string, any>> {
-	// eslint-disable-next-line @typescript-eslint/ban-types
 	entrypoint: 'astro/assets/services/sharp' | 'astro/assets/services/squoosh' | (string & {});
 	config?: T;
 }

diff --git a/packages/astro/src/assets/build/generate.ts b/packages/astro/src/assets/build/generate.ts
@@ -123,7 +123,7 @@ export async function generateImagesForPath(
 				);
 				await fs.promises.unlink(getFullImagePath(originalFilePath, env));
 			}
-		} catch (e) {
+		} catch {
 			/* No-op, it's okay if we fail to delete one of the file, we're not too picky. */
 		}
 	}

diff --git a/packages/astro/src/assets/endpoint/generic.ts b/packages/astro/src/assets/endpoint/generic.ts
@@ -19,7 +19,7 @@ async function loadRemoteImage(src: URL, headers: Headers) {
 		}
 
 		return await res.arrayBuffer();
-	} catch (err: unknown) {
+	} catch {
 		return undefined;
 	}
 }

diff --git a/packages/astro/src/assets/endpoint/node.ts b/packages/astro/src/assets/endpoint/node.ts
@@ -30,7 +30,7 @@ async function loadLocalImage(src: string, url: URL) {
 			if (!isAbsolute(filePath) || !filePath.startsWith(assetsDirPath)) {
 				return undefined;
 			}
-		} catch (err: unknown) {
+		} catch{
 			return undefined;
 		}
 	}
@@ -39,7 +39,7 @@ async function loadLocalImage(src: string, url: URL) {
 
 	try {
 		buffer = await readFile(fileUrl);
-	} catch (e) {
+	} catch {
 		// Fallback to try to load the file using `fetch`
 		try {
 			const sourceUrl = new URL(src, url.origin);
@@ -62,7 +62,7 @@ async function loadRemoteImage(src: URL) {
 		}
 
 		return Buffer.from(await res.arrayBuffer());
-	} catch (err: unknown) {
+	} catch {
 		return undefined;
 	}
 }

diff --git a/packages/astro/src/assets/services/sharp.ts b/packages/astro/src/assets/services/sharp.ts
@@ -28,7 +28,7 @@ async function loadSharp() {
 	let sharpImport: typeof import('sharp');
 	try {
 		sharpImport = (await import('sharp')).default;
-	} catch (e) {
+	} catch {
 		throw new AstroError(AstroErrorData.MissingSharp);
 	}
 

diff --git a/packages/astro/src/assets/services/vendor/squoosh/avif/avif_node_dec.ts b/packages/astro/src/assets/services/vendor/squoosh/avif/avif_node_dec.ts
@@ -1500,7 +1500,7 @@ var Module = (function () {
         wasmMemory.grow((size - buffer.byteLength + 65535) >>> 16)
         updateGlobalBufferAndViews(wasmMemory.buffer)
         return 1
-      } catch (e) {}
+      } catch {}
     }
     function _emscripten_resize_heap(requestedSize) {
       var oldSize = HEAPU8.length

diff --git a/packages/astro/src/assets/services/vendor/squoosh/avif/avif_node_enc.ts b/packages/astro/src/assets/services/vendor/squoosh/avif/avif_node_enc.ts
@@ -1660,7 +1660,7 @@ var Module = (function () {
         wasmMemory.grow((size - buffer.byteLength + 65535) >>> 16)
         updateGlobalBufferAndViews(wasmMemory.buffer)
         return 1
-      } catch (e) {}
+      } catch {}
     }
     function _emscripten_resize_heap(requestedSize) {
       var oldSize = HEAPU8.length

diff --git a/packages/astro/src/assets/services/vendor/squoosh/mozjpeg/mozjpeg_node_dec.ts b/packages/astro/src/assets/services/vendor/squoosh/mozjpeg/mozjpeg_node_dec.ts
@@ -1504,7 +1504,7 @@ var Module = (function () {
         wasmMemory.grow((size - buffer.byteLength + 65535) >>> 16)
         updateGlobalBufferAndViews(wasmMemory.buffer)
         return 1
-      } catch (e) {}
+      } catch {}
     }
     function _emscripten_resize_heap(requestedSize) {
       var oldSize = HEAPU8.length

diff --git a/packages/astro/src/assets/services/vendor/squoosh/mozjpeg/mozjpeg_node_enc.ts b/packages/astro/src/assets/services/vendor/squoosh/mozjpeg/mozjpeg_node_enc.ts
@@ -1627,7 +1627,7 @@ var Module = (function () {
         wasmMemory.grow((size - buffer.byteLength + 65535) >>> 16)
         updateGlobalBufferAndViews(wasmMemory.buffer)
         return 1
-      } catch (e) {}
+      } catch {}
     }
     function _emscripten_resize_heap(requestedSize) {
       var oldSize = HEAPU8.length

diff --git a/packages/astro/src/assets/services/vendor/squoosh/utils/workerPool.ts b/packages/astro/src/assets/services/vendor/squoosh/utils/workerPool.ts
@@ -1,4 +1,3 @@
-/* tslint-disable ban-types */
 import { parentPort, Worker } from 'worker_threads';
 
 function uuid() {

diff --git a/packages/astro/src/assets/services/vendor/squoosh/webp/webp_node_dec.ts b/packages/astro/src/assets/services/vendor/squoosh/webp/webp_node_dec.ts
@@ -1476,7 +1476,7 @@ var Module = (function () {
         wasmMemory.grow((size - buffer.byteLength + 65535) >>> 16)
         updateGlobalBufferAndViews(wasmMemory.buffer)
         return 1
-      } catch (e) {}
+      } catch {}
     }
     function _emscripten_resize_heap(requestedSize) {
       var oldSize = HEAPU8.length

diff --git a/packages/astro/src/assets/services/vendor/squoosh/webp/webp_node_enc.ts b/packages/astro/src/assets/services/vendor/squoosh/webp/webp_node_enc.ts
@@ -1656,7 +1656,7 @@ var Module = (function () {
         wasmMemory.grow((size - buffer.byteLength + 65535) >>> 16)
         updateGlobalBufferAndViews(wasmMemory.buffer)
         return 1
-      } catch (e) {}
+      } catch {}
     }
     function _emscripten_resize_heap(requestedSize) {
       var oldSize = HEAPU8.length

diff --git a/packages/astro/src/assets/types.ts b/packages/astro/src/assets/types.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/ban-types */
 import type { WithRequired } from '../type-utils.js';
 import type { VALID_INPUT_FORMATS, VALID_OUTPUT_FORMATS } from './consts.js';
 import type { ImageService } from './services/service.js';

diff --git a/packages/astro/src/assets/utils/metadata.ts b/packages/astro/src/assets/utils/metadata.ts
@@ -24,7 +24,7 @@ export async function imageMetadata(
 			format: type as ImageInputFormat,
 			orientation,
 		};
-	} catch (e) {
+	} catch {
 		throw new AstroError({
 			...AstroErrorData.NoImageMetadata,
 			message: AstroErrorData.NoImageMetadata.message(src),

diff --git a/packages/astro/src/assets/utils/node/emitAsset.ts b/packages/astro/src/assets/utils/node/emitAsset.ts
@@ -24,7 +24,7 @@ export async function emitESMImage(
 	let fileData: Buffer;
 	try {
 		fileData = await fs.readFile(url);
-	} catch (err) {
+	} catch {
 		return undefined;
 	}
 

diff --git a/packages/astro/src/assets/utils/remoteProbe.ts b/packages/astro/src/assets/utils/remoteProbe.ts
@@ -42,7 +42,7 @@ export async function inferRemoteSize(url: string): Promise<Omit<ImageMetadata,
 
 					return dimensions;
 				}
-			} catch (error) {
+			} catch {
 				// This catch block is specifically for `imageMetadata` errors
 				// which might occur if the accumulated data isn't yet sufficient.
 			}

diff --git a/packages/astro/src/assets/utils/vendor/image-size/lookup.ts b/packages/astro/src/assets/utils/vendor/image-size/lookup.ts
@@ -22,7 +22,7 @@ export function lookup(input: Uint8Array): ISizeCalculationResult {
   const type = detector(input)
 
   if (typeof type !== 'undefined') {
-    if (globalOptions.disabledTypes.indexOf(type) > -1) {
+    if (globalOptions.disabledTypes.includes(type)) {
       throw new TypeError('disabled file type: ' + type)
     }
 

diff --git a/packages/astro/src/assets/utils/vendor/image-size/types/svg.ts b/packages/astro/src/assets/utils/vendor/image-size/types/svg.ts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/non-nullable-type-assertion-style */
-/* eslint-disable regexp/prefer-regexp-exec */
+ 
 import type { IImage, ISize } from './interface.ts'
 import { toUTF8String } from './utils.js'
 
@@ -52,9 +52,9 @@ function parseViewbox(viewbox: string): IAttributes {
 }
 
 function parseAttributes(root: string): IAttributes {
-  const width = root.match(extractorRegExps.width)
-  const height = root.match(extractorRegExps.height)
-  const viewbox = root.match(extractorRegExps.viewbox)
+  const width = extractorRegExps.width.exec(root)
+  const height = extractorRegExps.height.exec(root)
+  const viewbox = extractorRegExps.viewbox.exec(root)
   return {
     height: height && (parseLength(height[2]) as number),
     viewbox: viewbox && (parseViewbox(viewbox[2]) as IAttributes),
@@ -94,7 +94,7 @@ export const SVG: IImage = {
   validate: (input) => svgReg.test(toUTF8String(input, 0, 1000)),
 
   calculate(input) {
-    const root = toUTF8String(input).match(extractorRegExps.root)
+    const root = extractorRegExps.root.exec(toUTF8String(input))
     if (root) {
       const attrs = parseAttributes(root[0])
       if (attrs.width && attrs.height) {

diff --git a/packages/astro/src/cli/info/index.ts b/packages/astro/src/cli/info/index.ts
@@ -71,7 +71,7 @@ async function copyToClipboard(text: string) {
 				return;
 			}
 			command = 'xclip -sel clipboard -l 1';
-		} catch (e) {
+		} catch {
 			// Did not find xclip, bail out!
 			return;
 		}
@@ -91,7 +91,7 @@ async function copyToClipboard(text: string) {
 			input: text.trim(),
 			encoding: 'utf8',
 		});
-	} catch (e) {
+	} catch {
 		console.error(
 			colors.red(`\nSorry, something went wrong!`) + ` Please copy the text above manually.`
 		);

diff --git a/packages/astro/src/cli/install-package.ts b/packages/astro/src/cli/install-package.ts
@@ -29,7 +29,7 @@ export async function getPackage<T>(
 		require.resolve(packageName, { paths: [options.cwd ?? process.cwd()] });
 		const packageImport = await import(packageName);
 		return packageImport as T;
-	} catch (e) {
+	} catch {
 		if (options.optional) return undefined;
 		let message = `To continue, Astro requires the following dependency to be installed: ${bold(
 			packageName
@@ -207,7 +207,7 @@ async function getRegistry(): Promise<string> {
 		_registry = stdout?.trim()?.replace(/\/$/, '') || fallback;
 		// Detect cases where the shell command returned a non-URL (e.g. a warning)
 		if (!new URL(_registry).host) _registry = fallback;
-	} catch (e) {
+	} catch {
 		_registry = fallback;
 	}
 	return _registry;

diff --git a/packages/astro/src/core/base-pipeline.ts b/packages/astro/src/core/base-pipeline.ts
@@ -104,5 +104,5 @@ export abstract class Pipeline {
 	abstract getComponentByRoute(routeData: RouteData): Promise<ComponentInstance>;
 }
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
+// eslint-disable-next-line @typescript-eslint/no-empty-object-type
 export interface HeadElements extends Pick<SSRResult, 'scripts' | 'styles' | 'links'> {}
diff --git a/packages/astro/src/core/build/plugins/util.ts b/packages/astro/src/core/build/plugins/util.ts
@@ -3,7 +3,7 @@ import type { BuildOptions, Rollup, Plugin as VitePlugin } from 'vite';
 import type { BuildInternals } from '../internal.js';
 import type { PageBuildData } from '../types.js';
 
-// eslint-disable-next-line @typescript-eslint/ban-types
+// eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
 type OutputOptionsHook = Extract<VitePlugin['outputOptions'], Function>;
 type OutputOptions = Parameters<OutputOptionsHook>[0];
 

diff --git a/packages/astro/src/core/config/schema.ts b/packages/astro/src/core/config/schema.ts
@@ -34,7 +34,7 @@ import { appendForwardSlash, prependForwardSlash, removeTrailingForwardSlash } f
 // Also, make sure to not index the complexified type, as it would return a simplified value type, which goes
 // back to the issue again. The complexified type should be the base representation that we want to expose.
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
+// eslint-disable-next-line @typescript-eslint/no-empty-object-type
 interface ComplexifyUnionObj {}
 
 type ComplexifyWithUnion<T> = T & ComplexifyUnionObj;

diff --git a/packages/astro/src/core/config/tsconfig.ts b/packages/astro/src/core/config/tsconfig.ts
@@ -53,8 +53,7 @@ export const presets = new Map<frameworkWithTSSettings, TSConfig>([
 	],
 ]);
 
-// eslint-disable-next-line @typescript-eslint/ban-types
-type TSConfigResult<T = {}> = Promise<
+type TSConfigResult<T = object> = Promise<
 	(TSConfckParseResult & T) | 'invalid-config' | 'missing-config' | 'unknown-error'
 >;
 

diff --git a/packages/astro/src/core/dev/dev.ts b/packages/astro/src/core/dev/dev.ts
@@ -76,7 +76,7 @@ export default async function dev(inlineConfig: AstroInlineConfig): Promise<DevS
 					}
 				})
 				.catch(() => {});
-		} catch (e) {
+		} catch {
 			// Just ignore the error, we don't want to block the dev server from starting and this is just a nice-to-have feature
 		}
 	}

diff --git a/packages/astro/src/core/errors/dev/vite.ts b/packages/astro/src/core/errors/dev/vite.ts
@@ -66,7 +66,7 @@ export function enhanceViteSSRError({
 		if (
 			fileId &&
 			!renderers?.find((r) => r.name === '@astrojs/mdx') &&
-			/Syntax error/.test(safeError.message) &&
+			safeError.message.includes('Syntax error') &&
 			/.mdx$/.test(fileId)
 		) {
 			safeError = new AstroError({
@@ -78,7 +78,7 @@ export function enhanceViteSSRError({
 		}
 
 		// Since Astro.glob is a wrapper around Vite's import.meta.glob, errors don't show accurate information, let's fix that
-		if (/Invalid glob/.test(safeError.message)) {
+		if (safeError.message.includes('Invalid glob')) {
 			const globPattern = /glob: "(.+)" \(/.exec(safeError.message)?.[1];
 
 			if (globPattern) {

diff --git a/packages/astro/src/core/routing/manifest/create.ts b/packages/astro/src/core/routing/manifest/create.ts
@@ -74,7 +74,7 @@ export function getParts(part: string, file: string) {
 export function validateSegment(segment: string, file = '') {
 	if (!file) file = segment;
 
-	if (/\]\[/.test(segment)) {
+	if (segment.includes('][')) {
 		throw new Error(`Invalid route ${file} \u2014 parameters must be separated`);
 	}
 	if (countOccurrences('[', segment) !== countOccurrences(']', segment)) {
@@ -293,7 +293,7 @@ function createInjectedRoutes({ settings, cwd }: CreateRouteManifestParams): Pri
 		let resolved: string;
 		try {
 			resolved = require.resolve(entrypoint, { paths: [cwd || fileURLToPath(config.root)] });
-		} catch (e) {
+		} catch {
 			resolved = fileURLToPath(new URL(entrypoint, config.root));
 		}
 		const component = slash(path.relative(cwd || fileURLToPath(config.root), resolved));

diff --git a/packages/astro/src/env/schema.ts b/packages/astro/src/env/schema.ts
@@ -96,7 +96,6 @@ export const EnvSchema = z.record(EnvSchemaKey, z.intersection(EnvFieldMetadata,
 // https://www.totaltypescript.com/concepts/the-prettify-helper
 type Prettify<T> = {
 	[K in keyof T]: T[K];
-	// eslint-disable-next-line @typescript-eslint/ban-types
 } & {};
 
 export type EnvSchema = z.infer<typeof EnvSchema>;

diff --git a/packages/astro/src/events/error.ts b/packages/astro/src/events/error.ts
@@ -82,7 +82,7 @@ export function eventError({
 /**
  * Safely get the error message from an error, even if it's a function.
  */
-// eslint-disable-next-line @typescript-eslint/ban-types
+// eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
 function getSafeErrorMessage(message: string | Function): string {
 	if (typeof message === 'string') {
 		return message;

diff --git a/packages/astro/src/events/toolbar.ts b/packages/astro/src/events/toolbar.ts
@@ -5,7 +5,6 @@ interface AppToggledEventPayload {
 }
 
 export function eventAppToggled(options: {
-	// eslint-disable-next-line @typescript-eslint/ban-types
 	appName: 'other' | (string & {});
 }): { eventName: string; payload: AppToggledEventPayload }[] {
 	const payload: AppToggledEventPayload = {

diff --git a/packages/astro/src/runtime/client/dev-toolbar/apps/audit/index.ts b/packages/astro/src/runtime/client/dev-toolbar/apps/audit/index.ts
@@ -21,7 +21,7 @@ export type Audit = {
 try {
 	customElements.define('astro-dev-toolbar-audit-window', DevToolbarAuditListWindow);
 	customElements.define('astro-dev-toolbar-audit-list-item', DevToolbarAuditListItem);
-} catch (e) {}
+} catch {}
 
 let showState = false;