fix(types): index and utils

RodrigoTomeES · Nov 4, 2023 · fe4bbec · fe4bbec
1 parent ec9c2a3
commit fe4bbec
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 28 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -16,7 +16,7 @@ import {
 } from './utils.js';
 
 import type { AstroIntegration } from 'astro';
-import type { InteralRenameOptions, RenameOptions } from './types.js';
+import type { InternalRenameOptions, RenameOptions } from './types.js';
 
 export default function renameIntegration(
   options?: RenameOptions,
@@ -60,7 +60,7 @@ export default function renameIntegration(
         options?.rename?.outputMapCallback?.(map);
       },
     },
-  } satisfies InteralRenameOptions;
+  } satisfies InternalRenameOptions;
 
   return {
     name: 'astro-rename',
@@ -74,16 +74,10 @@ export default function renameIntegration(
         } catch (_) {}
 
         updateConfig({
-          // TODO: Check types
-          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-          // @ts-ignore
           vite: await getViteConfiguration(_options?.rename, config.vite),
         });
       },
       'astro:config:done': async ({ config }) => {
-        // TODO: Check types
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
         if (config.output !== 'static') {
           throw new Error(
             `[astrojs-rename] \`output: "static"\` is only supported right now for this plugin.`,

diff --git a/src/types.ts b/src/types.ts
@@ -63,7 +63,7 @@ export type RenameOptions =
     }
   | undefined;
 
-export type InteralRenameOptions = {
+export type InternalRenameOptions = {
   rename: {
     strategy: PostcssRenameOptions['strategy'];
     by: PostcssRenameOptions['by'];

diff --git a/src/utils.ts b/src/utils.ts
@@ -3,7 +3,9 @@ import { resolve } from 'node:path';
 import postcssRename from 'postcss-rename';
 
 import type { AstroConfig } from 'astro';
-import type { RenameOptions } from './types.js';
+import type { InternalRenameOptions } from './types.js';
+import type { Options as PostcssRenameOptions } from 'postcss-rename';
+import type { CSSOptions, UserConfig } from 'vite'; // import CSSOptions type
 
 export const MAPS_DIRECTORY = './class-maps';
 
@@ -12,10 +14,7 @@ export const escapeRegExp = (string: string) =>
 export const calculatePercent = (before: number, after: number) =>
   (100 - (after / before) * 100) | 0;
 
-// TODO: Check types
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-export async function* walkFiles(dir: string) {
+export async function* walkFiles(dir: string): AsyncGenerator<string> {
   const dirents = await readdir(dir, { withFileTypes: true });
 
   for (const dirent of dirents) {
@@ -27,13 +26,7 @@ export async function* walkFiles(dir: string) {
 }
 
 export const getPostCssConfig = async (
-  // TODO: Check types
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-  // @ts-ignore
   root: UserConfig['root'],
-  // TODO: Check types
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-  // @ts-ignore
   postcssInlineOptions: CSSOptions['postcss'],
 ) => {
   let postcssConfigResult;
@@ -61,13 +54,7 @@ export const getPostCssConfig = async (
 };
 
 export const getViteConfiguration = async (
-  // TODO: Check types
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-  // @ts-ignore
-  options: RenameOptions['rename'],
-  // TODO: Check types
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-  // @ts-ignore
+  options: InternalRenameOptions['rename'],
   viteConfig: AstroConfig['vite'],
 ) => {
   // We need to manually load postcss config files because when inlining the tailwind and autoprefixer plugins,
@@ -83,7 +70,7 @@ export const getViteConfiguration = async (
       ? postcssConfigResult.plugins.slice()
       : [];
 
-  postcssPlugins.push(postcssRename(options));
+  postcssPlugins.push(postcssRename(options as PostcssRenameOptions));
 
   return {
     css: {