style: lint with prettier v3

unjs · Oct 4, 2023 · 7940e9b · 7940e9b
1 parent 1f2ab64
commit 7940e9b
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 38 deletions.
diff --git a/renovate.json b/renovate.json
@@ -1,5 +1,3 @@
 {
-  "extends": [
-    "github>unjs/renovate-config"
-  ]
+  "extends": ["github>unjs/renovate-config"]
 }
diff --git a/src/dotenv.ts b/src/dotenv.ts
@@ -90,7 +90,7 @@ export async function loadDotenv(options: DotenvOptions): Promise<Env> {
 function interpolate(
   target: Record<string, any>,
   source: Record<string, any> = {},
-  parse = (v: any) => v
+  parse = (v: any) => v,
 ) {
   function getValue(key: string) {
     // Source value 'wins' over target value
@@ -122,8 +122,8 @@ function interpolate(
             // eslint-disable-next-line no-console
             console.warn(
               `Please avoid recursive environment variables ( loop: ${parents.join(
-                " > "
-              )} > ${key} )`
+                " > ",
+              )} > ${key} )`,
             );
             return "";
           }
@@ -137,7 +137,7 @@ function interpolate(
         return value === undefined
           ? newValue
           : newValue.replace(replacePart, value);
-      }, value)
+      }, value),
     );
   }
 

diff --git a/src/loader.ts b/src/loader.ts
@@ -20,7 +20,7 @@ import type {
 
 export async function loadConfig<
   T extends UserInputConfig = UserInputConfig,
-  MT extends ConfigLayerMeta = ConfigLayerMeta
+  MT extends ConfigLayerMeta = ConfigLayerMeta,
 >(options: LoadConfigOptions<T, MT>): Promise<ResolvedConfig<T, MT>> {
   // Normalize options
   options.cwd = resolve(process.cwd(), options.cwd || ".");
@@ -75,19 +75,19 @@ export async function loadConfig<
     if (options.globalRc) {
       Object.assign(
         configRC,
-        rc9.readUser({ name: options.rcFile, dir: options.cwd })
+        rc9.readUser({ name: options.rcFile, dir: options.cwd }),
       );
       const workspaceDir = await findWorkspaceDir(options.cwd).catch(() => {});
       if (workspaceDir) {
         Object.assign(
           configRC,
-          rc9.read({ name: options.rcFile, dir: workspaceDir })
+          rc9.read({ name: options.rcFile, dir: workspaceDir }),
         );
       }
     }
     Object.assign(
       configRC,
-      rc9.read({ name: options.rcFile, dir: options.cwd })
+      rc9.read({ name: options.rcFile, dir: options.cwd }),
     );
   }
 
@@ -114,7 +114,7 @@ export async function loadConfig<
     config,
     configRC,
     pkgJson,
-    options.defaultConfig
+    options.defaultConfig,
   ) as T;
 
   // Allow extending
@@ -150,7 +150,7 @@ export async function loadConfig<
 
 async function extendConfig<
   T extends UserInputConfig = UserInputConfig,
-  MT extends ConfigLayerMeta = ConfigLayerMeta
+  MT extends ConfigLayerMeta = ConfigLayerMeta,
 >(config: InputConfig<T, MT>, options: LoadConfigOptions<T, MT>) {
   (config as any)._layers = config._layers || [];
   if (!options.extend) {
@@ -164,8 +164,8 @@ async function extendConfig<
   for (const key of keys as string[]) {
     extendSources.push(
       ...(Array.isArray(config[key]) ? config[key] : [config[key]]).filter(
-        Boolean
-      )
+        Boolean,
+      ),
     );
     delete config[key];
   }
@@ -185,8 +185,8 @@ async function extendConfig<
       // eslint-disable-next-line no-console
       console.warn(
         `Cannot extend config from \`${JSON.stringify(
-          originalExtendSource
-        )}\` in ${options.cwd}`
+          originalExtendSource,
+        )}\` in ${options.cwd}`,
       );
       continue;
     }
@@ -195,7 +195,7 @@ async function extendConfig<
       // TODO: Use error in next major versions
       // eslint-disable-next-line no-console
       console.warn(
-        `Cannot extend config from \`${extendSource}\` in ${options.cwd}`
+        `Cannot extend config from \`${extendSource}\` in ${options.cwd}`,
       );
       continue;
     }
@@ -216,11 +216,11 @@ const NPM_PACKAGE_RE =
 
 async function resolveConfig<
   T extends UserInputConfig = UserInputConfig,
-  MT extends ConfigLayerMeta = ConfigLayerMeta
+  MT extends ConfigLayerMeta = ConfigLayerMeta,
 >(
   source: string,
   options: LoadConfigOptions<T, MT>,
-  sourceOptions: SourceOptions<T, MT> = {}
+  sourceOptions: SourceOptions<T, MT> = {},
 ): Promise<ResolvedConfig<T, MT>> {
   // Custom user resolver
   if (options.resolve) {

diff --git a/src/types.ts b/src/types.ts
@@ -11,7 +11,7 @@ export type UserInputConfig = Record<string, any>;
 
 export interface C12InputConfig<
   T extends UserInputConfig = UserInputConfig,
-  MT extends ConfigLayerMeta = ConfigLayerMeta
+  MT extends ConfigLayerMeta = ConfigLayerMeta,
 > {
   $test?: T;
   $development?: T;
@@ -22,12 +22,12 @@ export interface C12InputConfig<
 
 export type InputConfig<
   T extends UserInputConfig = UserInputConfig,
-  MT extends ConfigLayerMeta = ConfigLayerMeta
+  MT extends ConfigLayerMeta = ConfigLayerMeta,
 > = C12InputConfig<T, MT> & T;
 
 export interface SourceOptions<
   T extends UserInputConfig = UserInputConfig,
-  MT extends ConfigLayerMeta = ConfigLayerMeta
+  MT extends ConfigLayerMeta = ConfigLayerMeta,
 > {
   meta?: MT;
   overrides?: T;
@@ -36,7 +36,7 @@ export interface SourceOptions<
 
 export interface ConfigLayer<
   T extends UserInputConfig = UserInputConfig,
-  MT extends ConfigLayerMeta = ConfigLayerMeta
+  MT extends ConfigLayerMeta = ConfigLayerMeta,
 > {
   config: T | null;
   source?: string;
@@ -48,15 +48,15 @@ export interface ConfigLayer<
 
 export interface ResolvedConfig<
   T extends UserInputConfig = UserInputConfig,
-  MT extends ConfigLayerMeta = ConfigLayerMeta
+  MT extends ConfigLayerMeta = ConfigLayerMeta,
 > extends ConfigLayer<T, MT> {
   layers?: ConfigLayer<T, MT>[];
   cwd?: string;
 }
 
 export interface LoadConfigOptions<
   T extends UserInputConfig = UserInputConfig,
-  MT extends ConfigLayerMeta = ConfigLayerMeta
+  MT extends ConfigLayerMeta = ConfigLayerMeta,
 > {
   name?: string;
   cwd?: string;
@@ -78,7 +78,7 @@ export interface LoadConfigOptions<
 
   resolve?: (
     id: string,
-    options: LoadConfigOptions<T, MT>
+    options: LoadConfigOptions<T, MT>,
   ) =>
     | null
     | undefined
@@ -97,12 +97,12 @@ export interface LoadConfigOptions<
 
 export type DefineConfig<
   T extends UserInputConfig = UserInputConfig,
-  MT extends ConfigLayerMeta = ConfigLayerMeta
+  MT extends ConfigLayerMeta = ConfigLayerMeta,
 > = (input: InputConfig<T, MT>) => InputConfig<T, MT>;
 
 export function createDefineConfig<
   T extends UserInputConfig = UserInputConfig,
-  MT extends ConfigLayerMeta = ConfigLayerMeta
+  MT extends ConfigLayerMeta = ConfigLayerMeta,
 >(): DefineConfig<T, MT> {
   return (input: InputConfig<T, MT>) => input;
 }
diff --git a/src/watch.ts b/src/watch.ts
@@ -12,15 +12,15 @@ import { loadConfig } from "./loader";
 
 export type ConfigWatcher<
   T extends UserInputConfig = UserInputConfig,
-  MT extends ConfigLayerMeta = ConfigLayerMeta
+  MT extends ConfigLayerMeta = ConfigLayerMeta,
 > = ResolvedConfig<T, MT> & {
   watchingFiles: string[];
   unwatch: () => Promise<void>;
 };
 
 export interface WatchConfigOptions<
   T extends UserInputConfig = UserInputConfig,
-  MT extends ConfigLayerMeta = ConfigLayerMeta
+  MT extends ConfigLayerMeta = ConfigLayerMeta,
 > extends LoadConfigOptions<T, MT> {
   chokidarOptions?: WatchOptions;
   debounce?: false | number;
@@ -51,7 +51,7 @@ const eventMap = {
 
 export async function watchConfig<
   T extends UserInputConfig = UserInputConfig,
-  MT extends ConfigLayerMeta = ConfigLayerMeta
+  MT extends ConfigLayerMeta = ConfigLayerMeta,
 >(options: WatchConfigOptions<T, MT>): Promise<ConfigWatcher<T, MT>> {
   let config = await loadConfig<T, MT>(options);
 
@@ -65,7 +65,7 @@ export async function watchConfig<
         .filter((l) => l.cwd)
         .flatMap((l) => [
           ...["ts", "js", "mjs", "cjs", "cts", "mts", "json"].map((ext) =>
-            resolve(l.cwd!, configFileName + "." + ext)
+            resolve(l.cwd!, configFileName + "." + ext),
           ),
           l.source && resolve(l.cwd!, l.source),
           // TODO: Support watching rc from home and workspace
@@ -74,11 +74,11 @@ export async function watchConfig<
               l.cwd!,
               typeof options.rcFile === "string"
                 ? options.rcFile
-                : `.${configName}rc`
+                : `.${configName}rc`,
             ),
           options.packageJson && resolve(l.cwd!, "package.json"),
         ])
-        .filter(Boolean)
+        .filter(Boolean),
     ),
   ] as string[];
 

diff --git a/vitest.config.ts b/vitest.config.ts
@@ -3,7 +3,7 @@ import { defineConfig } from "vitest/config";
 export default defineConfig({
   test: {
     coverage: {
-      reporter: ["text", "clover", "json"]
-    }
-  }
+      reporter: ["text", "clover", "json"],
+    },
+  },
 });