Merge pull request #89 from vahtos/follow_symlinks

fix symlinks
droppyjs · Jan 29, 2024 · 14cb683 · 14cb683
2 parents c93f6ef + 6a9f951
commit 14cb683
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
     "preferGlobal": true,
     "private": true,
     "engines": {
-        "node": ">= 12.10.0"
+        "node": ">= 14.14.0"
     },
     "scripts": {
         "build": "DROPPY_CACHE_PATH=$PWD/packages/cli/dist/cache.json lerna run --stream build --",

diff --git a/packages/server/lib/services/filetree.js b/packages/server/lib/services/filetree.js
@@ -103,13 +103,13 @@ filetree.updateDir = async function(dir) {
   if (initial) { // sync walk for performance
     initial = false;
     try {
-      entries = rrdir.sync(fullDir, {stats: true, exclude: cfg.ignorePatterns});
+      entries = rrdir.sync(fullDir, {stats: true, exclude: cfg.ignorePatterns, followSymlinks: true});
     } catch (err) {
       log.error(err);
     }
   } else {
     try {
-      entries = await rrdir.async(fullDir, {stats: true, exclude: cfg.ignorePatterns});
+      entries = await rrdir.async(fullDir, {stats: true, exclude: cfg.ignorePatterns, followSymlinks: true});
     } catch (err) {
       log.error(err);
     }

diff --git a/packages/server/lib/services/utils.js b/packages/server/lib/services/utils.js
@@ -38,7 +38,7 @@ utils.rm = function(p, cb) {
 };
 
 utils.rmdir = function(p, cb) {
-  fs.rmdir(p, {recursive: true}, cb);
+  fs.rm(p, {recursive: true}, cb);
 };
 
 utils.move = function(src, dst, cb) {