Skip to content

Commit fe88f89

Browse files
ematipicoematipico
authored
chore: use directive @ts-expect-error instead of @ts-ignore (#6429)
1 parent e1858e6 commit fe88f89

21 files changed

Lines changed: 26 additions & 41 deletions

File tree

‎packages/astro/src/core/add/babel.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ import parser from '@babel/parser';
33
import traverse from '@babel/traverse';
44
import * as t from '@babel/types';
55

6-
// @ts-ignore @babel/traverse isn't ESM and needs this trick
6+
// @ts-expect-error @babel/traverse isn't ESM and needs this trick
77
export const visit = traverse.default as typeof traverse;
88
export { t };
99

1010
export async function generate(ast: t.File) {
11-
// @ts-ignore @babel/generator isn't ESM and needs this trick
11+
// @ts-expect-error @babel/generator isn't ESM and needs this trick
1212
const astToText = generator.default as typeof generator;
1313
const { code } = astToText(ast);
1414
return code;

‎packages/astro/src/core/build/plugins/plugin-internals.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ export function vitePluginInternals(input: Set<string>, internals: BuildInternal
1515
external.push('shiki');
1616
}
1717

18-
// @ts-ignore
1918
extra.ssr = {
2019
external,
2120
noExternal,

‎packages/astro/src/core/endpoint/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ function createAPIContext({
5151
});
5252
},
5353
url: new URL(request.url),
54-
// @ts-ignore
54+
// @ts-expect-error
5555
get clientAddress() {
5656
if (!(clientAddressSymbol in request)) {
5757
if (adapterName) {

‎packages/astro/src/core/render/result.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@ export function createResult(args: CreateResultArgs): SSRResult {
174174
const Astro: AstroGlobal = {
175175
// @ts-expect-error
176176
__proto__: astroGlobal,
177-
// @ts-ignore
178177
get clientAddress() {
179178
if (!(clientAddressSymbol in request)) {
180179
if (args.adapterName) {
@@ -221,7 +220,7 @@ export function createResult(args: CreateResultArgs): SSRResult {
221220
writable: false,
222221
// TODO: Remove this hole "Deno" logic once our plugin gets Deno support
223222
value: async function (content: string, opts: MarkdownRenderingOptions) {
224-
// @ts-ignore
223+
// @ts-expect-error
225224
if (typeof Deno !== 'undefined') {
226225
throw new Error('Markdown is not supported in Deno SSR');
227226
}

‎packages/astro/src/jsx/renderer.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const renderer = {
55
jsxTransformOptions: async () => {
66
const {
77
default: { default: jsx },
8-
// @ts-ignore
8+
// @ts-expect-error
99
} = await import('@babel/plugin-transform-react-jsx');
1010
const { default: astroJSX } = await import('./babel.js');
1111
return {

‎packages/integrations/deno/src/server.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import type { SSRManifest } from 'astro';
33
import { App } from 'astro/app';
44

5-
// @ts-ignore
5+
// @ts-expect-error
66
import { fromFileUrl, serveFile, Server } from '@astrojs/deno/__deno_imports.js';
77

88
interface Options {
@@ -15,7 +15,7 @@ let _server: Server | undefined = undefined;
1515
let _startPromise: Promise<void> | undefined = undefined;
1616

1717
async function* getPrerenderedFiles(clientRoot: URL): AsyncGenerator<URL> {
18-
// @ts-ignore
18+
// @ts-expect-error
1919
for await (const ent of Deno.readDir(clientRoot)) {
2020
if (ent.isDirectory) {
2121
yield* getPrerenderedFiles(new URL(`./${ent.name}/`, clientRoot));

‎packages/integrations/image/src/endpoint.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { APIRoute } from 'astro';
22
import mime from 'mime';
3-
// @ts-ignore
3+
// @ts-expect-error
44
import loader from 'virtual:image-loader';
55
import { etag } from './utils/etag.js';
66
import { isRemoteImage } from './utils/paths.js';

‎packages/integrations/image/src/lib/get-image.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ export async function getImage(
111111
let loader = globalThis.astroImage?.loader;
112112

113113
if (!loader) {
114-
// @ts-ignore
114+
// @ts-expect-error
115115
const { default: mod } = await import('virtual:image-loader').catch(() => {
116116
throw new Error(
117117
'[@astrojs/image] Builtin image loader not found. (Did you remember to add the integration to your Astro config?)'
@@ -127,7 +127,7 @@ export async function getImage(
127127
const attributes = await loader.getImageAttributes(resolved);
128128

129129
// `.env` must be optional to support running in environments outside of `vite` (such as `astro.config`)
130-
// @ts-ignore
130+
// @ts-expect-error
131131
const isDev = import.meta.env?.DEV;
132132
const isLocalImage = !isRemoteImage(resolved.src);
133133

‎packages/integrations/image/src/loaders/squoosh.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// @ts-ignore
21
import { red } from 'kleur/colors';
32
import { error } from '../utils/logger.js';
43
import { metadata } from '../utils/metadata.js';

‎packages/integrations/image/src/vendor/squoosh/codecs.ts‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,46 +35,37 @@ export interface RotateOptions {
3535

3636
// MozJPEG
3737
import type { MozJPEGModule as MozJPEGEncodeModule } from './mozjpeg/mozjpeg_enc'
38-
// @ts-ignore
3938
import mozEnc from './mozjpeg/mozjpeg_node_enc.js'
4039
const mozEncWasm = new URL('./mozjpeg/mozjpeg_node_enc.wasm', getModuleURL(import.meta.url))
41-
// @ts-ignore
4240
import mozDec from './mozjpeg/mozjpeg_node_dec.js'
4341
const mozDecWasm = new URL('./mozjpeg/mozjpeg_node_dec.wasm', getModuleURL(import.meta.url))
4442

4543
// WebP
4644
import type { WebPModule as WebPEncodeModule } from './webp/webp_enc'
47-
// @ts-ignore
4845
import webpEnc from './webp/webp_node_enc.js'
4946
const webpEncWasm = new URL('./webp/webp_node_enc.wasm', getModuleURL(import.meta.url))
50-
// @ts-ignore
5147
import webpDec from './webp/webp_node_dec.js'
5248
const webpDecWasm = new URL('./webp/webp_node_dec.wasm', getModuleURL(import.meta.url))
5349

5450
// AVIF
5551
import type { AVIFModule as AVIFEncodeModule } from './avif/avif_enc'
56-
// @ts-ignore
5752
import avifEnc from './avif/avif_node_enc.js'
5853
const avifEncWasm = new URL('./avif/avif_node_enc.wasm', getModuleURL(import.meta.url))
59-
// @ts-ignore
6054
import avifDec from './avif/avif_node_dec.js'
6155
const avifDecWasm = new URL('./avif/avif_node_dec.wasm', getModuleURL(import.meta.url))
6256

6357
// PNG
64-
// @ts-ignore
6558
import * as pngEncDec from './png/squoosh_png.js'
6659
const pngEncDecWasm = new URL('./png/squoosh_png_bg.wasm', getModuleURL(import.meta.url))
6760
const pngEncDecInit = () =>
6861
pngEncDec.default(fsp.readFile(pathify(pngEncDecWasm.toString())))
6962

7063
// OxiPNG
71-
// @ts-ignore
7264
import * as oxipng from './png/squoosh_oxipng.js'
7365
const oxipngWasm = new URL('./png/squoosh_oxipng_bg.wasm', getModuleURL(import.meta.url))
7466
const oxipngInit = () => oxipng.default(fsp.readFile(pathify(oxipngWasm.toString())))
7567

7668
// Resize
77-
// @ts-ignore
7869
import * as resize from './resize/squoosh_resize.js'
7970
const resizeWasm = new URL('./resize/squoosh_resize_bg.wasm', getModuleURL(import.meta.url))
8071
const resizeInit = () => resize.default(fsp.readFile(pathify(resizeWasm.toString())))

0 commit comments

Comments
 (0)