Merge pull request redwoodjs#315 from olance/patch-1

Allow creating app in existing empty dir
mohsen1 · Mar 24, 2020 · 192f9df · 192f9df
2 parents 4ecebda + f8992d8
commit 192f9df
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/packages/create-redwood-app-template/packages/create-redwood-app/src/create-redwood-app.js b/packages/create-redwood-app-template/packages/create-redwood-app/src/create-redwood-app.js
@@ -57,6 +57,12 @@ if (!targetDir) {
 }
 
 const newAppDir = path.resolve(process.cwd(), targetDir)
+const appDirExists = fs.existsSync(newAppDir)
+
+if (appDirExists && fs.readdirSync(newAppDir).length > 0) {
+  console.error(`'${newAppDir}' already exists and is not empty.`)
+  process.exit(1)
+}
 
 const createProjectTasks = ({ newAppDir }) => {
   const tmpDownloadPath = tmp.tmpNameSync({
@@ -66,11 +72,8 @@ const createProjectTasks = ({ newAppDir }) => {
 
   return [
     {
-      title: `Creating directory '${newAppDir}'`,
+      title: `${appDirExists ? 'Using' : 'Creating'} directory '${newAppDir}'`,
       task: () => {
-        if (fs.existsSync(newAppDir)) {
-          throw new Error(`'${newAppDir}' already exists.`)
-        }
         fs.mkdirSync(newAppDir, { recursive: true })
       },
     },
@@ -159,7 +162,7 @@ new Listr(
   .then(() => {
     // TODO: show helpful out for next steps.
     console.log()
-    console.log(`Thanks for trying out Redwood! We've created '${newAppDir}'`)
+    console.log(`Thanks for trying out Redwood! We've created your app in '${newAppDir}'`)
     console.log()
     console.log(
       'Inside that directory you can run `yarn rw dev` to start the development server.'