DARK: Themes > Ignore user created folders inside default theme dirs

packages/cli-kit/lib/node/filesystem.ts

@@ -21,6 +21,17 @@ export async function exists(path: string): Promise<boolean> {
   }
 }
 
+export async function isDirectory(path: string): Promise<boolean> {
+  try {
+    const stats: Stats = await FilesystemPromises.stat(path);
+
+    return stats.isDirectory();
+  }
+  catch {
+    return false;
+  }
+}
+
 export async function tapIntoTmp<T>(callback: (tmp: string) => T | Promise<T>): Promise<T> {
   return temporaryDirectoryTask(callback);
 }

packages/theme/lib/cli/commands/theme/dev.ts

@@ -53,12 +53,19 @@ export default class Dev extends ThemeCommand {
             }
 
             for (const file of present.filter(f => !descriptors.find(d => d.file_name === f))) {
+              const path = Path.resolve(directory, file);
+              const isDir = await Filesystem.isDirectory(path);
+
+              if (isDir) {
+                continue;
+              }
+
               await execute(theme, 'save', type, file);
             }
 
             for (const descriptor of descriptors) {
               const path = Path.resolve(directory, descriptor.file_name);
-              if (!(await Filesystem.exists(path))) {
+              if ((await Filesystem.isDirectory(path)) || !(await Filesystem.exists(path))) {
                 return await execute(theme, 'delete', type, descriptor.file_name);
               }
 

packages/theme/lib/cli/services/dev/worker.ts

@@ -51,6 +51,7 @@ export default class ThemeWorker extends Worker.Abstract {
       awaitWriteFinish: { stabilityThreshold: 50 },
       ignoreInitial: true,
       persistent: true,
+      depth: 0,
     });
 
     this.command.controller.signal.addEventListener('abort', () => {