chore: reuse globFiles utility

camunda · Sep 20, 2023 · 98eec74 · 98eec74
1 parent b4d86f3
commit 98eec74
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/app/lib/util/files.js b/app/lib/util/files.js
@@ -134,29 +134,30 @@ function globFiles(pattern, options = {}) {
 
   const {
     searchPaths,
+    cwd,
     ...otherOptions
   } = options;
 
   if (searchPaths) {
     return searchPaths.reduce((paths, searchPath) => {
       return [
         ...paths,
-        ...globSync(toPosixPath(pattern), {
-          ...defaultOptions,
+        ...globFiles(pattern, {
           ...otherOptions,
-          cwd: toPosixPath(searchPath)
-        }).map(toPosixPath)
+          cwd: searchPath
+        })
       ];
     }, []);
   }
 
-  if (otherOptions.cwd) {
-    otherOptions.cwd = toPosixPath(otherOptions.cwd);
-  }
+  const cwdOptions = cwd
+    ? { cwd: toPosixPath(cwd) }
+    : {};
 
   return globSync(toPosixPath(pattern), {
     ...defaultOptions,
-    ...otherOptions
+    ...otherOptions,
+    ...cwdOptions
   }).map(toPosixPath);
 }