From 5ec29ebe2d5d0dd87af978bb4b2bb06c8ee8df07 Mon Sep 17 00:00:00 2001
From: Bill Cui <bill.cui.work@gmail.com>
Date: Sat, 11 Nov 2023 10:47:31 -0800
Subject: [PATCH] Ensured that directories are scrubbed only after files are
 removed (#36)

---
 package.json         | 2 +-
 scrubber/scrubber.ts | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index eaaa746..a8719e8 100644
--- 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
index 0e5aad5..5742fce 100644
--- 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));
   }
 }