Merge branch 'main' into main

farm-fe · May 4, 2024 · 6e3d7a3 · 6e3d7a3
2 parents 27afcdb + 28e1a37
commit 6e3d7a3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/.changeset/nine-schools-visit.md b/.changeset/nine-schools-visit.md
@@ -0,0 +1,5 @@
+---
+'@farmfe/core': patch
+---
+
+fix(vite plugin): some vite plugins do not provide `alias` configuration errors
diff --git a/packages/core/src/config/index.ts b/packages/core/src/config/index.ts
@@ -212,7 +212,7 @@ export async function resolveConfig(
   resolvedUserConfig.rustPlugins = rustPlugins;
 
   // Temporarily dealing with alias objects and arrays in js will be unified in rust in the future.]
-  if (resolvedUserConfig.compilation.resolve?.alias && vitePlugins.length) {
+  if (vitePlugins.length) {
     resolvedUserConfig.compilation.resolve.alias = getAliasEntries(
       resolvedUserConfig.compilation.resolve.alias
     );

diff --git a/packages/core/src/utils/plugin-utils.ts b/packages/core/src/utils/plugin-utils.ts
@@ -53,7 +53,7 @@ export function throwError(pluginName: string, type: string, error: Error) {
 export function getAliasEntries(
   entries: Record<string, string> | Array<Alias>
 ): any {
-  if (!entries) {
+  if (!entries || !Object.keys(entries).length) {
     return [];
   }