[now-build-utils] Exclude now.json from fallback build src (#4042)

#4016
vercel · Apr 10, 2020 · 7ca672a · 7ca672a
1 parent 3af0e99
commit 7ca672a
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 3 deletions.
diff --git a/packages/now-build-utils/src/detect-builders.ts b/packages/now-build-utils/src/detect-builders.ts
@@ -190,7 +190,12 @@ export async function detectBuilders(
       hasNextApiFiles = true;
     }
 
-    if (!fallbackEntrypoint && buildCommand && !fileName.includes('/')) {
+    if (
+      !fallbackEntrypoint &&
+      buildCommand &&
+      !fileName.includes('/') &&
+      fileName !== 'now.json'
+    ) {
       fallbackEntrypoint = fileName;
     }
   }

diff --git a/packages/now-build-utils/test/unit.builds-and-routes-detector.test.ts b/packages/now-build-utils/test/unit.builds-and-routes-detector.test.ts
@@ -7,6 +7,19 @@ import {
 } from '../';
 
 describe('Test `detectBuilders`', () => {
+  it('should never select now.json src', async () => {
+    const files = ['docs/index.md', 'mkdocs.yml', 'now.json'];
+    const { builders, errors } = await detectBuilders(files, null, {
+      projectSettings: {
+        buildCommand: 'mkdocs build',
+        outputDirectory: 'site',
+      },
+    });
+    expect(errors).toBe(null);
+    expect(builders).toBeDefined();
+    expect(builders![0].src).not.toBe('now.json');
+  });
+
   it('package.json + no build', async () => {
     const pkg = { dependencies: { next: '9.0.0' } };
     const files = ['package.json', 'pages/index.js', 'public/index.html'];
@@ -817,6 +830,21 @@ describe('Test `detectBuilders`', () => {
 
 describe('Test `detectBuilders` with `featHandleMiss=true`', () => {
   const featHandleMiss = true;
+
+  it('should never select now.json src', async () => {
+    const files = ['docs/index.md', 'mkdocs.yml', 'now.json'];
+    const { builders, errors } = await detectBuilders(files, null, {
+      featHandleMiss,
+      projectSettings: {
+        buildCommand: 'mkdocs build',
+        outputDirectory: 'site',
+      },
+    });
+    expect(errors).toBe(null);
+    expect(builders).toBeDefined();
+    expect(builders![0].src).not.toBe('now.json');
+  });
+
   it('package.json + no build', async () => {
     const pkg = { dependencies: { next: '9.0.0' } };
     const files = ['package.json', 'pages/index.js', 'public/index.html'];

diff --git a/packages/now-build-utils/test/unit.walk.test.ts b/packages/now-build-utils/test/unit.walk.test.ts
@@ -21,7 +21,6 @@ describe('Test `walkParentDirs`', () => {
       await walkParentDirs({ base, start, filename });
       fail('Expected error');
     } catch (error) {
-      console.log(error);
       deepEqual(
         (error as Error).message,
         'Expected "base" to be absolute path'
@@ -36,7 +35,6 @@ describe('Test `walkParentDirs`', () => {
       await walkParentDirs({ base, start, filename });
       fail('Expected error');
     } catch (error) {
-      console.log(error);
       deepEqual(
         (error as Error).message,
         'Expected "start" to be absolute path'