Updating to match fast-glob options

jdalrymple · Apr 29, 2018 · 3cebb92 · 3cebb92
1 parent 9660000
commit 3cebb92
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -34,7 +34,7 @@
     "bluebird": "^3.5.1",
     "dir-compare": "^1.4.0",
     "fs-extra": "^5.0.0",
-    "globby": "^7.1.1", 
+    "globby": "^8.0.1", 
     "is-there": "^4.4.3",
     "shortid": "^2.2.8",
     "tempy": "^0.2.1",

diff --git a/src/Hg.js b/src/Hg.js
@@ -94,7 +94,7 @@ async function cloneMultipleAndMerge(from, to, pythonPath) {
     await combinedRepo.update({ clean: true, revision: 'default' });
 
     const files = await Globby(['*', '!.hg'], {
-      nodir: false,
+      onlyFiles: false,
       dot: true,
       cwd: combinedRepo.path,
     });

diff --git a/src/HgRepo.js b/src/HgRepo.js
@@ -98,7 +98,7 @@ class HgRepo {
     await Command.run(cloneCmd);
 
     // Remove .hgtags from each folder
-    const files = await Globby(['**/.hgtags'], { nodir: false, dot: true, cwd: path });
+    const files = await Globby(['**/.hgtags'], { onlyFiles: false, dot: true, cwd: path });
 
     if (files.length) {
       await Promise.all(files.map(hgpath => Fs.remove(Path.resolve(path, hgpath))));
@@ -108,7 +108,7 @@ class HgRepo {
 
     // Rename .hgignore to .gitignore, and remove the line syntax:*
     const hgIgnoreFiles = await Globby(['**/.hgignore'], {
-      nodir: false,
+      onlyFiles: false,
       dot: true,
       cwd: path,
     });