Use resolveConfig instead of resolve for PostCSS plugin

webpro-nl · Aug 21, 2024 · 03a7583 · 03a7583
1 parent 3cd136f
commit 03a7583
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 20 deletions.
diff --git a/packages/knip/src/WorkspaceWorker.ts b/packages/knip/src/WorkspaceWorker.ts
@@ -289,10 +289,6 @@ export class WorkspaceWorker {
 
         for (const configFilePath of configFilePaths) {
           const opts = { ...options, configFileDir: dirname(configFilePath), configFileName: basename(configFilePath) };
-
-          // biome-ignore lint/suspicious/noExplicitAny: raw incoming user data
-          let config: any;
-
           if (hasResolveEntryPaths || shouldRunConfigResolver) {
             const isManifest = basename(configFilePath) === 'package.json';
             const fd = isManifest ? undefined : this.cache.getFileDescriptor(configFilePath);
@@ -303,7 +299,7 @@ export class WorkspaceWorker {
               if (fd.meta.data.resolveConfig)
                 for (const id of fd.meta.data.resolveConfig) addDependency(id, configFilePath);
             } else {
-              config = await loadConfigForPlugin(configFilePath, plugin, opts, pluginName);
+              const config = await loadConfigForPlugin(configFilePath, plugin, opts, pluginName);
               const data: CacheItem = {};
               if (config) {
                 if (hasResolveEntryPaths) {
@@ -320,16 +316,16 @@ export class WorkspaceWorker {
               }
             }
           }
-
-          if (hasResolve) {
-            const dependencies = (await plugin.resolve?.(config, options)) ?? [];
-            for (const id of dependencies) addDependency(id, join(cwd, 'package.json'));
-          }
         }
 
         const finalEntryPaths = getFinalEntryPaths(plugin, options, configEntryPaths);
         for (const id of finalEntryPaths) addDependency(id);
 
+        if (hasResolve) {
+          const dependencies = (await plugin.resolve?.(options)) ?? [];
+          for (const id of dependencies) addDependency(id, join(cwd, 'package.json'));
+        }
+
         debugLogArray([name, plugin.title], 'dependencies', pluginDependencies);
       }
     }

diff --git a/packages/knip/src/plugins/astro/index.ts b/packages/knip/src/plugins/astro/index.ts
@@ -13,7 +13,7 @@ const entry = ['astro.config.{js,cjs,mjs,ts}', 'src/content/config.ts'];
 
 const production = ['src/pages/**/*.{astro,mdx,js,ts}', 'src/content/**/*.mdx'];
 
-const resolve: Resolve = (_, options) => {
+const resolve: Resolve = options => {
   const { isProduction, manifest } = options;
   const dependencies = [];
 

diff --git a/packages/knip/src/plugins/postcss/index.ts b/packages/knip/src/plugins/postcss/index.ts
@@ -1,4 +1,4 @@
-import type { IsPluginEnabled, Plugin, Resolve, ResolveConfig } from '#p/types/plugins.js';
+import type { IsPluginEnabled, Plugin, ResolveConfig } from '#p/types/plugins.js';
 import { hasDependency, toLilconfig } from '#p/util/plugin.js';
 import type { PostCSSConfig } from './types.js';
 
@@ -18,21 +18,19 @@ const config = [
 ];
 
 const resolveConfig: ResolveConfig<PostCSSConfig> = config => {
-  return config.plugins
+  const plugins = config.plugins
     ? (Array.isArray(config.plugins) ? config.plugins : Object.keys(config.plugins)).flatMap(plugin => {
         if (typeof plugin === 'string') return plugin;
         if (Array.isArray(plugin) && typeof plugin[0] === 'string') return plugin[0];
         return [];
       })
     : [];
-};
 
-const resolve: Resolve<PostCSSConfig> = async (options, config) => {
-  for (const plugin of await resolveConfig(options, config)) {
+  for (const plugin of plugins) {
     // Because postcss is not included in peerDependencies of tailwindcss
     if (plugin === 'tailwindcss') return ['postcss'];
   }
-  return [];
+  return plugins;
 };
 
 export default {
@@ -41,5 +39,4 @@ export default {
   isEnabled,
   config,
   resolveConfig,
-  resolve,
 } satisfies Plugin;
diff --git a/packages/knip/src/types/plugins.ts b/packages/knip/src/types/plugins.ts
@@ -33,8 +33,7 @@ export type ResolveEntryPaths<T = any> = (config: T, options: PluginOptions) =>
 // biome-ignore lint/suspicious/noExplicitAny: TODO
 export type ResolveConfig<T = any> = (config: T, options: PluginOptions) => Promise<string[]> | string[];
 
-// biome-ignore lint/suspicious/noExplicitAny: TODO
-export type Resolve<T = any> = (config: T, options: PluginOptions) => Promise<string[]> | string[];
+export type Resolve = (options: PluginOptions) => Promise<string[]> | string[];
 
 export interface Plugin {
   title: string;