fix(@umijs/plugins): model files may be collected more than once in s…

…ome cases (#12535) * fix(@umijs/plugins): model files could be collected more then one time * refactor(@umijs/plugins): refactor in modelUtils --------- Co-authored-by: 刘文壮 <[email protected]>
umijs · Jul 9, 2024 · 167a695 · 167a695
1 parent 0593101
commit 167a695
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/packages/plugins/src/utils/modelUtils.ts b/packages/plugins/src/utils/modelUtils.ts
@@ -11,7 +11,7 @@ import {
 import { readFileSync } from 'fs';
 import { basename, dirname, extname, format, join, relative } from 'path';
 import { IApi } from 'umi';
-import { chalk, glob, winPath } from 'umi/plugin-utils';
+import { chalk, glob, lodash, winPath } from 'umi/plugin-utils';
 import { getIdentifierDeclaration } from './astUtils';
 
 export function transformSync(content: any, opts: any) {
@@ -126,7 +126,7 @@ export class ModelUtils {
   getAllModels(opts: { sort?: object; extraModels: string[] }) {
     // reset count
     this.count = 1;
-    const models = [
+    const modelFiles = [
       ...this.getModels({
         base: join(this.api.paths.absSrcPath, 'models'),
         pattern: '**/*.{ts,tsx,js,jsx}',
@@ -140,7 +140,10 @@ export class ModelUtils {
         pattern: '**/model.{ts,tsx,js,jsx}',
       }),
       ...opts.extraModels,
-    ].map((file: string) => {
+    ];
+    // remove duplicate
+    const modelUniqFiles = lodash.uniq(modelFiles);
+    const models = modelUniqFiles.map((file: string) => {
       return new Model(
         file,
         this.api.paths.absSrcPath,