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

electron-userland · Jul 31, 2016 · 3418239 · 3418239
1 parent da700d4
commit 3418239
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
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
		@@ -0,0 +1 @@
		Test that we don't take in account just directory `app` without `package.json`