fix: don't take in account just directory app without package.json

develar · develar · commit 341823947df8 · 2016-07-31T17:30:39.000+02:00
diff --git a/src/util/util.ts b/src/util/util.ts
@@ -204,9 +204,9 @@ export async function computeDefaultAppDirectory(projectDir: string, userAppDir:
   }
 
   for (let dir of DEFAULT_APP_DIR_NAMES) {
-    const absolutePath = path.join(projectDir, dir)
+    const absolutePath = path.join(projectDir, dir, "package.json")
     const stat = await statOrNull(absolutePath)
-    if (stat != null && stat.isDirectory()) {
+    if (stat != null && stat.isFile()) {
       return absolutePath
     }
   }
diff --git a/test/fixtures/test-app-one/app/package.json/readme.md b/test/fixtures/test-app-one/app/package.json/readme.md
@@ -0,0 +1 @@
+Ignore `package.json` directory.
diff --git a/test/fixtures/test-app-one/app/readme.md b/test/fixtures/test-app-one/app/readme.md
@@ -0,0 +1 @@
+Test that we don't take in account just directory `app` without `package.json`

Original file line number	Diff line number	Diff line change
`@@ -204,9 +204,9 @@ export async function computeDefaultAppDirectory(projectDir: string, userAppDir:`
`204`	`204`	`}`
`205`	`205`
`206`	`206`	`for (let dir of DEFAULT_APP_DIR_NAMES) {`
`207`		`- const absolutePath = path.join(projectDir, dir)`
	`207`	`+ const absolutePath = path.join(projectDir, dir, "package.json")`
`208`	`208`	`const stat = await statOrNull(absolutePath)`
`209`		`- if (stat != null && stat.isDirectory()) {`
	`209`	`+ if (stat != null && stat.isFile()) {`
`210`	`210`	`return absolutePath`
`211`	`211`	`}`
`212`	`212`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Test that we don't take in account just directory `app` without `package.json`