refactor: resolvePlugins by combining resolveFarmPlugins and resolveAsyncPlugins

.changeset/fair-buttons-peel.md

@@ -0,0 +1,5 @@
+---
+'@farmfe/core': minor
+---
+
+New Function resolvePlugin created which combine the functionality of resolveFarmPlugin and resloveAsyncPlugins.

.changeset/sixty-actors-play.md

@@ -0,0 +1,16 @@
+---
+'@farmfe/core': major
+---
+
+Description:
+
+This PR introduces a new function, resolvePlugins, which combines the functionality of resolveFarmPlugins and resolveAsyncPlugins. This new function first resolves any promises and flattens the array of plugins, and then processes the resulting plugins as in resolveFarmPlugins. This allows the use of async and nested plugins in the configuration.
+
+Changes:
+
+Added a new function resolvePlugins in src/plugin/index.ts that handles async and nested plugins.
+Replaced calls to resolveFarmPlugins with resolvePlugins in the codebase.
+
+BREAKING CHANGE:
+
+This change should not introduce any breaking changes. The new function resolvePlugins is backwards compatible with resolveFarmPlugins.

packages/core/src/config/index.ts

@@ -10,7 +10,7 @@
  resolveAsyncPlugins,
  resolveConfigHook,
  resolveConfigResolvedHook,
- resolveFarmPlugins
+ resolvePlugins
 } from '../plugin/index.js';
 import {
  bindingPath,
@@ -158,7 +158,7 @@
  config: rawConfig
  };
 
- const { jsPlugins, rustPlugins } = await resolveFarmPlugins(userConfig);
+ const { jsPlugins, rustPlugins } = await resolvePlugins(userConfig);
 
  const rawJsPlugins = (await resolveAsyncPlugins(jsPlugins || [])).filter(
  Boolean
@@ -310,7 +310,7 @@
  // for node target, we should not define process.env.NODE_ENV
  config.output?.targetEnv === 'node'
  ? {}
  : Object.keys(userConfig.env || {}).reduce((env: any, key) => {
  env[`$__farm_regex:(global(This)?\\.)?process\\.env\\.${key}`] =
  JSON.stringify(userConfig.env[key]);
  return env;

packages/core/src/plugin/index.ts

@@ -9,18 +9,19 @@
 export * from './js/index.js';
 export * from './rust/index.js';
 
-export async function resolveFarmPlugins(config: UserConfig) {
- const plugins = config.plugins ?? [];
+export async function resolvePlugins(config: UserConfig) {
+ let plugins = config.plugins ?? [];
 
  if (!plugins.length) {
  return {
  rustPlugins: [],
  jsPlugins: []
  };
  }
+ // First, resolve any promises and flatten the array
+ plugins = await resolveAsyncPlugins(plugins);
 
  const rustPlugins = [];
-
  const jsPlugins: JsPlugin[] = [];
 
  for (const plugin of plugins) {
@@ -56,7 +57,6 @@
  };
 }
 
-// resolve promise plugins
 export async function resolveAsyncPlugins<T>(arr: T[]): Promise<T[]> {
  return arr.reduce<Promise<T[]>>(async (acc, current) => {
  const flattenedAcc = await acc;
@@ -144,6 +144,6 @@
 export function getSortedPluginHooks(
  plugins: JsPlugin[],
  hookName: keyof JsPlugin
 ): any {
  return plugins.map((p: JsPlugin) => p[hookName]).filter(Boolean);
 }