improved livereload

Author: oscarotero

CHANGELOG.md

@@ -80,6 +80,7 @@ Go to the `v1` branch to see the changelog of Lume 1.
 - Parsing the escaped URLs in CSS files.
 - Improved the output CSS and JS code of components.
 - Components interoperability, specially between JSX vs text engines.
+- Improved reload after renaming or removing a folder.
 
 [#660]: https://github.com/lumeland/lume/issues/660
 [#736]: https://github.com/lumeland/lume/issues/736

core/fs.ts

@@ -93,15 +93,6 @@ export default class FS {
       entry.src = src;
     }
 
-    // New directory, walk it
-    if (entry.type === "directory") {
-      if (!exist) {
-        this.#walkFs(entry);
-      }
-
-      return;
-    }
-
     try {
       entry.getInfo();
     } catch (error) {
@@ -117,6 +108,11 @@ export default class FS {
         return exist;
       }
     }
+
+    // New directory, walk it
+    if (entry.type === "directory" && !exist) {
+      this.#walkFs(entry);
+    }
   }
 
   #isValid(path: string) {

core/site.ts

@@ -628,12 +628,13 @@ export default class Site {
       }
 
       // Remove pages or static files depending on this entry
-      const pages = this.pages.filter((page) => page.src.entry === entry).map((
-        page,
-      ) => page.outputPath);
-      const files = this.files.filter((file) => file.src.entry === entry).map((
-        file,
-      ) => file.outputPath);
+      const pages = this.pages
+        .filter((page) => pathBelongs(entry.path, page.src.entry?.path))
+        .map((page) => page.outputPath);
+      const files = this.files
+        .filter((file) => pathBelongs(entry.path, file.src.entry?.path))
+        .map((file) => file.outputPath);
+
       await this.writer.removeFiles([...pages, ...files]);
     }
 
@@ -1106,3 +1107,10 @@ export type SiteEventType = keyof SiteEventMap;
 
 /** A generic Lume plugin */
 export type Plugin = (site: Site) => void;
+
+function pathBelongs(base: string, path?: string): boolean {
+  if (!path) {
+    return false;
+  }
+  return base === path || path?.startsWith(base + "/");
+}

core/writer.ts

@@ -176,19 +176,27 @@ export class FSWriter implements Writer {
           const outputPath = posix.join(this.dest, file);
           this.#outputs.delete(outputPath.toLowerCase());
           await Deno.remove(outputPath);
+
           // Remove empty directories
-          const dir = posix.dirname(outputPath);
-          try {
-            if (dir !== this.dest) {
-              await Deno.remove(dir);
-            }
-          } catch {
-            // Ignored
-          }
+          removeEmptyDirectory(outputPath, this.dest);
         } catch {
           // Ignored
         }
       },
     );
   }
 }
+
+function removeEmptyDirectory(path: string, base: string) {
+  const dir = posix.dirname(path);
+
+  try {
+    if (dir !== base) {
+      Deno.removeSync(dir);
+      // Check if the parent directory is also empty
+      removeEmptyDirectory(dir, base);
+    }
+  } catch {
+    // Ignored
+  }
+}