Change unique templates filtration

ogonkov · Aug 1, 2021 · 331f831 · 331f831
1 parent 8316194
commit 331f831
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 22 deletions.
diff --git a/src/lib/ast/get-templates-imports.js b/src/lib/ast/get-templates-imports.js
@@ -1,6 +1,6 @@
 import {getFirstExistedPath} from '../utils/get-first-existed-path';
 import {getPossiblePaths} from '../utils/get-possible-paths';
-import {isUniqueTemplate} from '../utils/is-unique-template';
+import {isUniqueAsset} from '../utils/is-unique-asset';
 
 import {getDependenciesTemplates} from './get-dependencies-templates';
 
@@ -21,11 +21,6 @@ async function filterPaths([path, paths]) {
     }
 }
 
-
-function filterUniqueTemplates(templates) {
-    return templates.filter(isUniqueTemplate);
-}
-
 /**
  * @param {Object} loaderContext
  * @param {nunjucks.nodes.Root} nodes
@@ -41,9 +36,9 @@ export function getTemplatesImports(loaderContext, nodes, searchPaths) {
         }
 
         return true;
-    });
+    }).filter(isUniqueAsset);
     const possiblePaths = getPossiblePaths(templateDeps, searchPaths);
     const resolvedTemplates = possiblePaths.map(filterPaths);
 
-    return Promise.all(resolvedTemplates).then(filterUniqueTemplates);
+    return Promise.all(resolvedTemplates);
 }
diff --git a/src/lib/utils/is-unique-template.js b/src/lib/utils/is-unique-template.js