Unverified Commit eff272f1 authored by Wyatt Johnson's avatar Wyatt Johnson Committed by GitHub

[eslint] Fix lint-staged to ensure eslint is ran (#65622)

Previously, eslint was not running during lint-staged because
`isPathIgnored` actually returns a promise. This changes it to async to
make it work correctly.
parent f94e213d
...@@ -2,40 +2,47 @@ const { quote } = require('shell-quote') ...@@ -2,40 +2,47 @@ const { quote } = require('shell-quote')
const { ESLint } = require('eslint') const { ESLint } = require('eslint')
const eslint = new ESLint() const eslint = new ESLint()
const isWin = process.platform === 'win32'
/**
* Escape filenames to ensure that spaces and such aren't interpreted as
* separators.
*
* @param {string[]} filenames
* @returns {string[]}
*/
function escape(filenames) {
if (process.platform === 'win32') {
return filenames
}
return filenames.map((filename) => quote([filename]).replace(/\\@/g, '@'))
}
module.exports = { module.exports = {
'**/*.{js,jsx,mjs,ts,tsx,mts}': (filenames) => { '**/*.{js,jsx,mjs,ts,tsx,mts}': async (filenames) => {
const escapedFileNames = filenames const escapedFileNames = escape(filenames).join(' ')
.map((filename) => (isWin ? filename : escape([filename]))) const eslintFileNames = await Promise.all(
.join(' ') filenames.map(async (filename) => {
const ignored = await eslint.isPathIgnored(filename)
return ignored ? null : filename
})
)
return [ return [
`prettier --with-node-modules --ignore-path .prettierignore --write ${escapedFileNames}`, `prettier --with-node-modules --ignore-path .prettierignore --write ${escapedFileNames}`,
`eslint --no-ignore --max-warnings=0 --fix ${filenames `eslint --no-ignore --max-warnings=0 --fix ${escape(eslintFileNames.filter((filename) => filename !== null)).join(' ')}`,
.filter((file) => !eslint.isPathIgnored(file))
.map((f) => `"${f}"`)
.join(' ')}`,
`git add ${escapedFileNames}`, `git add ${escapedFileNames}`,
] ]
}, },
'**/*.{json,md,mdx,css,html,yml,yaml,scss}': (filenames) => { '**/*.{json,md,mdx,css,html,yml,yaml,scss}': (filenames) => {
const escapedFileNames = filenames const escapedFileNames = escape(filenames).join(' ')
.map((filename) => (isWin ? filename : escape([filename])))
.join(' ')
return [ return [
`prettier --with-node-modules --ignore-path .prettierignore --write ${escapedFileNames}`, `prettier --with-node-modules --ignore-path .prettierignore --write ${escapedFileNames}`,
`git add ${escapedFileNames}`, `git add ${escapedFileNames}`,
] ]
}, },
'**/*.rs': (filenames) => { '**/*.rs': (filenames) => {
const escapedFileNames = filenames const escapedFileNames = escape(filenames).join(' ')
.map((filename) => (isWin ? filename : escape([filename])))
.join(' ')
return [`cargo fmt -- ${escapedFileNames}`, `git add ${escapedFileNames}`] return [`cargo fmt -- ${escapedFileNames}`, `git add ${escapedFileNames}`]
}, },
} }
function escape(str) {
const escaped = quote(str)
return escaped.replace(/\\@/g, '@')
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment