fix: plugins not loading properly

ubermanu · Jul 19, 2023 · 8261d35 · 8261d35
1 parent fd9c1b4
commit 8261d35
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/actions/build.ts b/src/actions/build.ts
@@ -29,7 +29,6 @@ export const build = async (themeName: string, locale = 'en_US') => {
   const dest = path.join(themeConfig.dest, locale)
   for (const plugin of themeConfig.plugins) {
     try {
-      // @ts-ignore
       await plugin({
         ...themeConfig,
         dest,

diff --git a/src/config.ts b/src/config.ts
@@ -92,17 +92,23 @@ export const getThemeConfig = memo(async (themeName: string) => {
     }
   }
 
-  const pluginList: Plugin[] | string[] = []
+  const pluginList: Array<Plugin | string | [string, any]> = []
 
   // Add the preset plugins to the plugin list
   if (userConfig.presets) {
     const presets = await Promise.all(userConfig.presets.map(transformPresetDefinition))
     presets.forEach((preset) => {
-      // @ts-ignore
-      pluginList.push(...preset.plugins)
+      if (Array.isArray(preset.plugins)) {
+        preset.plugins.forEach((plugin) => pluginList.push(plugin))
+      }
     })
   }
 
+  // Add the user plugins to the plugin list
+  if (userConfig.plugins) {
+    userConfig.plugins.forEach((plugin) => pluginList.push(plugin))
+  }
+
   // Add support for multiple plugin formats
   // It can be 'string', 'object' or 'function'
   const plugins = await Promise.all(pluginList.map(transformPluginDefinition))