adds --quiet flag

vercel · Jun 17, 2021 · 8866553 · 8866553
1 parent b5ec567
commit 8866553
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 7 deletions.
diff --git a/packages/next/lib/eslint/runLintCheck.ts b/packages/next/lib/eslint/runLintCheck.ts
@@ -28,7 +28,8 @@ async function lint(
   lintDirs: string[],
   eslintrcFile: string | null,
   pkgJsonPath: string | null,
-  eslintOptions: any = null
+  eslintOptions: any = null,
+  reportErrorsOnly: boolean = false
 ): Promise<
   | string
   | null
@@ -59,7 +60,6 @@ async function lint(
       'error'
     )} - ESLint class not found. Please upgrade to ESLint version 7 or later`
   }
-
   let options: any = {
     useEslintrc: true,
     baseConfig: {},
@@ -110,8 +110,9 @@ async function lint(
   }
   const lintStart = process.hrtime()
 
-  const results = await eslint.lintFiles(lintDirs)
+  let results = await eslint.lintFiles(lintDirs)
   if (options.fix) await ESLint.outputFixes(results)
+  if (reportErrorsOnly) results = await ESLint.getErrorResults(results) // Only return errors if --quiet flag is used
 
   const formattedResult = formatResults(baseDir, results)
   const lintEnd = process.hrtime(lintStart)
@@ -141,7 +142,8 @@ export async function runLintCheck(
   baseDir: string,
   lintDirs: string[],
   lintDuringBuild: boolean = false,
-  eslintOptions: any = null
+  eslintOptions: any = null,
+  reportErrorsOnly: boolean = false
 ): ReturnType<typeof lint> {
   try {
     // Find user's .eslintrc file
@@ -202,7 +204,8 @@ export async function runLintCheck(
       lintDirs,
       eslintrcFile,
       pkgJsonPath,
-      eslintOptions
+      eslintOptions,
+      reportErrorsOnly
     )
   } catch (err) {
     throw err

diff --git a/test/integration/eslint/custom-config/.eslintrc b/test/integration/eslint/custom-config/.eslintrc
@@ -3,6 +3,6 @@
   "root": true,
   "rules": {
     "@next/next/no-html-link-for-pages": 0,
-    "@next/next/no-sync-scripts": 2
+    "@next/next/no-sync-scripts": 1
   }
 }
diff --git a/test/integration/eslint/custom-config/pages/index.js b/test/integration/eslint/custom-config/pages/index.js
@@ -1,6 +1,7 @@
 const Home = () => (
   <div>
     <p>Home</p>
+    <script src="https://example.com" />
     /* Badly formatted comment */
   </div>
 )

diff --git a/test/integration/eslint/test/index.test.js b/test/integration/eslint/test/index.test.js
@@ -41,6 +41,9 @@ describe('ESLint', () => {
       })
 
       const output = stdout + stderr
+      expect(output).toContain(
+        'Warning: External synchronous scripts are forbidden'
+      )
       expect(output).toContain(
         'Error: Comments inside children section of tag should be placed inside braces'
       )
@@ -75,7 +78,7 @@ describe('ESLint', () => {
       )
     })
 
-    test.only('invalid eslint version', async () => {
+    test('invalid eslint version', async () => {
       const { stdout, stderr } = await nextBuild(dirInvalidEslintVersion, [], {
         stdout: true,
         stderr: true,
@@ -115,6 +118,9 @@ describe('ESLint', () => {
       })
 
       const output = stdout + stderr
+      expect(output).toContain(
+        'Warning: External synchronous scripts are forbidden'
+      )
       expect(output).toContain(
         'Error: Comments inside children section of tag should be placed inside braces'
       )
@@ -167,5 +173,20 @@ describe('ESLint', () => {
         }
       }
     })
+
+    test('quiet flag suppresses warnings and only reports errors', async () => {
+      const { stdout, stderr } = await nextLint(dirCustomConfig, ['--quiet'], {
+        stdout: true,
+        stderr: true,
+      })
+
+      const output = stdout + stderr
+      expect(output).toContain(
+        'Error: Comments inside children section of tag should be placed inside braces'
+      )
+      expect(output).not.toContain(
+        'Warning: External synchronous scripts are forbidden'
+      )
+    })
   })
 })