lint-staged 12.4.0 → 12.4.3

package/README.md

@@ -594,7 +594,7 @@ const success = await lintStaged({
   maxArgLength: null,
   quiet: false,
   relative: false,
-  shell: false
+  shell: false,
   stash: true,
   verbose: false
 })

package/bin/lint-staged.js

@@ -4,7 +4,7 @@ import fs from 'fs'
 import path from 'path'
 import { fileURLToPath } from 'url'
 
-import cmdline from 'commander'
+import { Option, program } from 'commander'
 import debug from 'debug'
 import supportsColor from 'supports-color'
 
@@ -23,50 +23,75 @@ const packageJsonPath = path.join(fileURLToPath(import.meta.url), '../../package
 const packageJson = JSON.parse(fs.readFileSync(packageJsonPath))
 const version = packageJson.version
 
-cmdline
-  .version(version)
-  .option('--allow-empty', 'allow empty commits when tasks revert all staged changes', false)
-  .option(
-    '-p, --concurrent <number|boolean>',
-    'the number of tasks to run concurrently, or false for serial',
-    true
+const debugLog = debug('lint-staged:bin')
+debugLog('Running `lint-staged@%s`', version)
+
+const cli = program.version(version)
+
+cli.option('--allow-empty', 'allow empty commits when tasks revert all staged changes', false)
+
+cli.option(
+  '-p, --concurrent <number|boolean>',
+  'the number of tasks to run concurrently, or false for serial',
+  true
+)
+
+cli.option('-c, --config [path]', 'path to configuration file, or - to read from stdin')
+
+cli.option('--cwd [path]', 'run all tasks in specific directory, instead of the current')
+
+cli.option('-d, --debug', 'print additional debug information', false)
+
+cli.option('--max-arg-length [number]', 'maximum length of the command-line argument string', 0)
+
+/**
+ * We don't want to show the `--stash` flag because it's on by default, and only show the
+ * negatable flag `--no-stash` in stead. There seems to be a bug in Commander.js where
+ * configuring only the latter won't actually set the default value.
+ */
+cli
+  .addOption(
+    new Option('--stash', 'enable the backup stash, and revert in case of errors')
+      .default(true)
+      .hideHelp()
   )
-  .option('-c, --config [path]', 'path to configuration file, or - to read from stdin')
-  .option('--cwd [path]', 'run all tasks in specific directory, instead of the current')
-  .option('-d, --debug', 'print additional debug information', false)
-  .option('--max-arg-length', 'maximum length of the command-line argument string')
-  .option('--no-stash', 'disable the backup stash, and do not revert in case of errors', false)
-  .option('-q, --quiet', 'disable lint-staged’s own console output', false)
-  .option('-r, --relative', 'pass relative filepaths to tasks', false)
-  .option('-x, --shell [path]', 'skip parsing of tasks for better shell support', false)
-  .option(
-    '-v, --verbose',
-    'show task output even when tasks succeed; by default only failed output is shown',
-    false
+  .addOption(
+    new Option(
+      '--no-stash',
+      'disable the backup stash, and do not revert in case of errors'
+    ).default(false)
   )
-  .parse(process.argv)
 
-const cmdlineOptions = cmdline.opts()
+cli.option('-q, --quiet', 'disable lint-staged’s own console output', false)
+
+cli.option('-r, --relative', 'pass relative filepaths to tasks', false)
+
+cli.option('-x, --shell [path]', 'skip parsing of tasks for better shell support', false)
+
+cli.option(
+  '-v, --verbose',
+  'show task output even when tasks succeed; by default only failed output is shown',
+  false
+)
 
-if (cmdlineOptions.debug) {
+const cliOptions = cli.parse(process.argv).opts()
+
+if (cliOptions.debug) {
   debug.enable('lint-staged*')
 }
 
-const debugLog = debug('lint-staged:bin')
-debugLog('Running `lint-staged@%s`', version)
-
 const options = {
-  allowEmpty: !!cmdlineOptions.allowEmpty,
-  concurrent: JSON.parse(cmdlineOptions.concurrent),
-  configPath: cmdlineOptions.config,
-  cwd: cmdlineOptions.cwd,
-  debug: !!cmdlineOptions.debug,
-  maxArgLength: JSON.parse(cmdlineOptions.maxArgLength || null),
-  quiet: !!cmdlineOptions.quiet,
-  relative: !!cmdlineOptions.relative,
-  shell: cmdlineOptions.shell /* Either a boolean or a string pointing to the shell */,
-  stash: !!cmdlineOptions.stash, // commander inverts `no-<x>` flags to `!x`
-  verbose: !!cmdlineOptions.verbose,
+  allowEmpty: !!cliOptions.allowEmpty,
+  concurrent: JSON.parse(cliOptions.concurrent),
+  configPath: cliOptions.config,
+  cwd: cliOptions.cwd,
+  debug: !!cliOptions.debug,
+  maxArgLength: cliOptions.maxArgLength || undefined,
+  quiet: !!cliOptions.quiet,
+  relative: !!cliOptions.relative,
+  shell: cliOptions.shell /* Either a boolean or a string pointing to the shell */,
+  stash: !!cliOptions.stash, // commander inverts `no-<x>` flags to `!x`
+  verbose: !!cliOptions.verbose,
 }
 
 debugLog('Options parsed from command-line:', options)

package/lib/searchConfigs.js

@@ -14,7 +14,8 @@ const debugLog = debug('lint-staged:searchConfigs')
 
 const EXEC_GIT = ['ls-files', '-z', '--full-name']
 
-const filterPossibleConfigFiles = (file) => searchPlaces.includes(basename(file))
+const filterPossibleConfigFiles = (files) =>
+  files.filter((file) => searchPlaces.includes(basename(file)))
 
 const numberOfLevels = (file) => file.split('/').length
 
@@ -58,20 +59,18 @@ export const searchConfigs = async (
     return { [configPath]: validateConfig(config, filepath, logger) }
   }
 
-  /** Get all possible config files known to git */
-  const cachedFiles = parseGitZOutput(await execGit(EXEC_GIT, { cwd: gitDir })).filter(
-    filterPossibleConfigFiles
-  )
-
-  /** Get all possible config files from uncommitted files */
-  const otherFiles = parseGitZOutput(
-    await execGit([...EXEC_GIT, '--others', '--exclude-standard'], { cwd: gitDir })
-  ).filter(filterPossibleConfigFiles)
+  const [cachedFiles, otherFiles] = await Promise.all([
+    /** Get all possible config files known to git */
+    execGit(EXEC_GIT, { cwd: gitDir }).then(parseGitZOutput).then(filterPossibleConfigFiles),
+    /** Get all possible config files from uncommitted files */
+    execGit([...EXEC_GIT, '--others', '--exclude-standard'], { cwd: gitDir })
+      .then(parseGitZOutput)
+      .then(filterPossibleConfigFiles),
+  ])
 
   /** Sort possible config files so that deepest is first */
   const possibleConfigFiles = [...cachedFiles, ...otherFiles]
-    .map((file) => join(gitDir, file))
-    .map((file) => normalize(file))
+    .map((file) => normalize(join(gitDir, file)))
     .filter(isInsideDirectory(cwd))
     .sort(sortDeepestParth)
 
@@ -85,15 +84,17 @@ export const searchConfigs = async (
 
   /** Load and validate all configs to the above object */
   await Promise.all(
-    possibleConfigFiles
-      .map((configPath) => loadConfig({ configPath }, logger))
-      .map((promise) =>
-        promise.then(({ config, filepath }) => {
-          if (config) {
-            configs[filepath] = validateConfig(config, filepath, logger)
+    Object.keys(configs).map((configPath) =>
+      loadConfig({ configPath }, logger).then(({ config, filepath }) => {
+        if (config) {
+          if (configPath !== filepath) {
+            debugLog('Config file "%s" resolved to "%s"', configPath, filepath)
           }
-        })
-      )
+
+          configs[configPath] = validateConfig(config, filepath, logger)
+        }
+      })
+    )
   )
 
   /** Get validated configs from the above object, without any `null` values (not found) */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lint-staged",
-  "version": "12.4.0",
+  "version": "12.4.3",
   "description": "Lint files staged by git",
   "license": "MIT",
   "repository": "https://github.com/okonet/lint-staged",
@@ -34,35 +34,36 @@
   "dependencies": {
     "cli-truncate": "^3.1.0",
     "colorette": "^2.0.16",
-    "commander": "^8.3.0",
-    "debug": "^4.3.3",
+    "commander": "^9.3.0",
+    "debug": "^4.3.4",
     "execa": "^5.1.1",
-    "lilconfig": "2.0.4",
-    "listr2": "^4.0.1",
-    "micromatch": "^4.0.4",
+    "lilconfig": "2.0.5",
+    "listr2": "^4.0.5",
+    "micromatch": "^4.0.5",
     "normalize-path": "^3.0.0",
-    "object-inspect": "^1.12.0",
+    "object-inspect": "^1.12.2",
     "pidtree": "^0.5.0",
     "string-argv": "^0.3.1",
-    "supports-color": "^9.2.1",
+    "supports-color": "^9.2.2",
     "yaml": "^1.10.2"
   },
   "devDependencies": {
-    "@babel/core": "^7.16.12",
-    "@babel/eslint-parser": "^7.16.5",
-    "@babel/preset-env": "^7.16.11",
-    "babel-jest": "^27.4.6",
+    "@babel/core": "^7.18.2",
+    "@babel/eslint-parser": "^7.18.2",
+    "@babel/preset-env": "^7.18.2",
+    "babel-jest": "^28.1.0",
+    "babel-plugin-transform-imports": "2.0.0",
     "consolemock": "^1.1.0",
-    "eslint": "^8.7.0",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-import": "^2.25.4",
+    "eslint": "^8.16.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^4.0.0",
-    "fs-extra": "^10.0.0",
-    "husky": "^7.0.4",
-    "jest": "^27.4.7",
+    "fs-extra": "^10.1.0",
+    "husky": "^8.0.1",
+    "jest": "^28.1.0",
     "jest-snapshot-serializer-ansi": "^1.0.0",
-    "prettier": "^2.5.1"
+    "prettier": "^2.6.2"
   },
   "keywords": [
     "lint",