Ensured that directories are scrubbed only after files are removed (#36)

uwblueprint · Nov 11, 2023 · 5ec29eb · 5ec29eb
1 parent 05edbde
commit 5ec29eb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@uwblueprint/create-bp-app",
-  "version": "1.0.19",
+  "version": "1.0.20",
   "description": "Starter code generation CLI tool.",
   "main": "index.js",
   "bin": "bin/index.js",

diff --git a/scrubber/scrubber.ts b/scrubber/scrubber.ts
@@ -70,16 +70,9 @@ class Scrubber {
       filesToDelete,
     ).map((filePath: string) => removeFileOrDir(filePath));
 
-    const scrubDirPromise = scrubDir(
-      this.config.dir,
-      ignoreFiles,
-      tags,
-      isDryRun,
-    );
-
     // Remove files first, then scrub.
     return Promise.all(removeFilePromises)
-      .then(() => scrubDirPromise)
+      .then(() => scrubDir(this.config!.dir, ignoreFiles, tags, isDryRun))
       .catch((err) => Promise.reject(err));
   }
 }