From 0cf42cd4cfc295b2e5d76790e4c36e9bc7416a19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20De=20Boey?= Date: Tue, 18 Oct 2022 15:57:27 +0200 Subject: [PATCH] refactor(scripts): use `ESLint` class instead of `CLIEngine` class internally --- scripts/generate-browser-globals.js | 12 +++++------- scripts/generate-configs.js | 7 +++---- scripts/generate-rules.js | 7 +++---- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/scripts/generate-browser-globals.js b/scripts/generate-browser-globals.js index 7b3bcfe..d4c8dd3 100644 --- a/scripts/generate-browser-globals.js +++ b/scripts/generate-browser-globals.js @@ -6,7 +6,7 @@ const fs = require("fs") const path = require("path") -const { CLIEngine } = require("eslint") +const { ESLint } = require("eslint") const { browser: originalGlobals } = require("globals") const targetFile = path.resolve(__dirname, "../lib/configs/_browser-globals.js") @@ -33,7 +33,7 @@ for (const key of Object.keys(originalGlobals).sort()) { } } -const linter = new CLIEngine({ fix: true }) +const linter = new ESLint({ fix: true }) const rawCode = `/** * DON'T EDIT THIS FILE WHICH WAS GENERATED BY './scripts/generate-browser-globals.js'. */ @@ -41,8 +41,6 @@ const rawCode = `/** module.exports = ${JSON.stringify(globals, null, 4)} ` -const code = - linter.executeOnText(rawCode, "_browser-globals.js").results[0].output || - rawCode - -fs.writeFileSync(targetFile, code) +linter + .lintText(rawCode, { filePath: targetFile }) + .then(([{ output }]) => fs.writeFileSync(targetFile, output || rawCode)) diff --git a/scripts/generate-configs.js b/scripts/generate-configs.js index 6884b7c..606c18e 100644 --- a/scripts/generate-configs.js +++ b/scripts/generate-configs.js @@ -6,7 +6,7 @@ const fs = require("fs") const path = require("path") -const { CLIEngine } = require("eslint") +const { ESLint } = require("eslint") const targetFile = path.resolve(__dirname, "../lib/configs.js") @@ -28,6 +28,5 @@ ${fs ` ) -const linter = new CLIEngine({ fix: true }) -const result = linter.executeOnFiles([targetFile]) -CLIEngine.outputFixes(result) +const linter = new ESLint({ fix: true }) +linter.lintFiles([targetFile]).then(([result]) => ESLint.outputFixes(result)) diff --git a/scripts/generate-rules.js b/scripts/generate-rules.js index 1ff36ce..7aa352a 100644 --- a/scripts/generate-rules.js +++ b/scripts/generate-rules.js @@ -6,7 +6,7 @@ const fs = require("fs") const path = require("path") -const { CLIEngine } = require("eslint") +const { ESLint } = require("eslint") const targetFile = path.resolve(__dirname, "../lib/rules.js") @@ -34,6 +34,5 @@ ${fs ` ) -const linter = new CLIEngine({ fix: true }) -const result = linter.executeOnFiles([targetFile]) -CLIEngine.outputFixes(result) +const linter = new ESLint({ fix: true }) +linter.lintFiles([targetFile]).then(([result]) => ESLint.outputFixes(result))