From 51db2a6b34792c99a9a685bdfbfe87a7343631b9 Mon Sep 17 00:00:00 2001
From: Samuel Attard <sam@electronjs.org>
Date: Thu, 10 Dec 2020 10:57:06 -0800
Subject: [PATCH] build: fix JS linting (#26876)

---
 .gitignore     |  2 +-
 script/lint.js | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3819e9cb62d4..e92abcd0baa2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,7 +55,7 @@ electron.d.ts
 spec/.hash
 
 # Eslint Cache
-.eslintcache
+.eslintcache*
 
 # Generated native addon files
 /spec-main/fixtures/native-addon/echo/build/
diff --git a/script/lint.js b/script/lint.js
index 2bb2bc3166fe..70f6a51693f7 100755
--- a/script/lint.js
+++ b/script/lint.js
@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 
+const crypto = require('crypto');
 const { GitProcess } = require('dugite');
 const childProcess = require('child_process');
 const { ESLint } = require('eslint');
@@ -99,20 +100,25 @@ const LINTERS = [{
   test: filename => filename.endsWith('.js') || filename.endsWith('.ts'),
   run: async (opts, filenames) => {
     const eslint = new ESLint({
-      cache: true,
+      // Do not use the lint cache on CI builds
+      cache: !process.env.CI,
+      cacheLocation: `node_modules/.eslintcache.${crypto.createHash('md5').update(fs.readFileSync(__filename)).digest('hex')}`,
       extensions: ['.js', '.ts'],
       fix: opts.fix
     });
     const formatter = await eslint.loadFormatter();
     let successCount = 0;
-    for (const result of await eslint.lintFiles(filenames)) {
+    const results = await eslint.lintFiles(filenames);
+    for (const result of results) {
       successCount += result.errorCount === 0 ? 1 : 0;
-      if (result.errorCount !== 0 || result.warningCount !== 0) {
-        console.log(formatter.format([result]));
-      } else if (opts.verbose) {
+      if (opts.verbose && result.errorCount === 0 && result.warningCount === 0) {
         console.log(`${result.filePath}: no errors or warnings`);
       }
     }
+    console.log(formatter.format(results));
+    if (opts.fix) {
+      await ESLint.outputFixes(results);
+    }
     if (successCount !== filenames.length) {
       console.error('Linting had errors');
       process.exit(1);