lint-staged 16.1.1 → 16.1.3

package/README.md

@@ -304,7 +304,7 @@ Supported are any executables installed locally or globally via `npm` as well as
 
 > Using globally installed scripts is discouraged, since lint-staged may not work for someone who doesn't have it installed.
 
-`lint-staged` uses [execa](https://github.com/sindresorhus/execa#preferlocal) to locate locally installed scripts. So in your `.lintstagedrc` you can write:
+`lint-staged` uses [nano-spawn](https://github.com/sindresorhus/nano-spawn?tab=readme-ov-file#optionspreferlocal) to locate locally installed scripts. So in your `.lintstagedrc` you can write:
 
 ```json
 {

package/lib/chunkFiles.js

@@ -52,7 +52,11 @@ export const chunkFiles = ({ files, baseDir, maxArgLength = null, relative = fal
     return [normalizedFiles] // wrap in an array to return a single chunk
   }
 
-  const fileListLength = normalizedFiles.map((file) => file.filepath).join(' ').length
+  /** Calculate total character length of all filepaths, with added spaces in between */
+  const fileListLength =
+    normalizedFiles.reduce((sum, file) => sum + file.filepath.length, 0) +
+    Math.max(normalizedFiles.length - 1, 0)
+
   debugLog(
     `Resolved an argument string length of ${fileListLength} characters from ${normalizedFiles.length} files`
   )

package/lib/gitWorkflow.js

@@ -1,3 +1,4 @@
+import fs from 'node:fs/promises'
 import path from 'node:path'
 
 import debug from 'debug'
@@ -279,8 +280,22 @@ export class GitWorkflow {
     // These additions per chunk are run "serially" to prevent race conditions.
     // Git add creates a lockfile in the repo causing concurrent operations to fail.
     for (const files of this.matchedFileChunks) {
-      /** @todo Deleted files cannot be staged because they're... deleted */
-      await this.execGit(['add', '--', ...files.map((f) => f.filepath)])
+      const accessCheckedFiles = await Promise.allSettled(
+        files.map(async (f) => {
+          if (f.status === 'D') {
+            await fs.access(f.filepath)
+            return f.filepath // File is no longer deleted and can be added
+          } else {
+            return f.filepath
+          }
+        })
+      )
+
+      const addableFiles = accessCheckedFiles.flatMap((r) =>
+        r.status === 'fulfilled' ? [r.value] : []
+      )
+
+      await this.execGit(['add', '--', ...addableFiles])
     }
 
     debugLog('Done adding task modifications to index!')

package/lib/resolveGitRepo.js

@@ -8,53 +8,53 @@ import { normalizePath } from './normalizePath.js'
 const debugLog = debug('lint-staged:resolveGitRepo')
 
 /**
- * Resolve .git directory relative to repo top-level directory
- *
- * @example ".git"
+ * Relative path up to the repo top-level directory
+ * @example "../"
  */
-const resolveRelativeGitDir = async (cwd) => {
-  /**
-   * Absolute repo top-level directory
-   *
-   * @example <caption>Git on macOS</caption>
-   * "/Users/iiro/Documents/git/lint-staged"
-   *
-   * @example <caption>Git for Windows</caption>
-   * "C:\Users\iiro\Documents\git\lint-staged"
-   *
-   * @example <caption>Git installed with MSYS2, this doesn't work when used as CWD with Node.js child_process</caption>
-   * "/c/Users/iiro/Documents/git/lint-staged"
-   */
-  const topLevelPromise = execGit(['rev-parse', '--show-toplevel'], { cwd })
-
-  /**
-   * Absolute .git directory, similar to top-level
-   *
-   * @example "/Users/iiro/Documents/git/lint-staged/.git"
-   */
-  const absoluteGitDirPromise = execGit(['rev-parse', '--absolute-git-dir'], { cwd })
+const CDUP = '--show-cdup'
 
-  const [topLevel, absoluteGitDir] = await Promise.all([topLevelPromise, absoluteGitDirPromise])
+/**
+ * Absolute repo top-level directory
+ *
+ * @example <caption>Git on macOS</caption>
+ * "/Users/iiro/Documents/git/lint-staged"
+ *
+ * @example <caption>Git for Windows</caption>
+ * "C:\Users\iiro\Documents\git\lint-staged"
+ *
+ * @example <caption>Git installed with MSYS2, this doesn't work when used as CWD with Node.js child_process</caption>
+ * "/c/Users/iiro/Documents/git/lint-staged"
+ */
+const TOPLEVEL = '--show-toplevel'
 
-  return path.relative(topLevel, absoluteGitDir)
-}
+/**
+ * Absolute .git directory, similar to top-level
+ *
+ * @example "/Users/iiro/Documents/git/lint-staged/.git"
+ */
+const ABSOLUTE_GIT_DIR = '--absolute-git-dir'
 
 /** Resolve git directory and possible submodule paths */
 export const resolveGitRepo = async (cwd = process.cwd()) => {
   try {
     debugLog('Resolving git repo from `%s`', cwd)
 
+    /** Git rev-parse returns all three flag values on separate lines  */
+    const revParseOutput = await execGit(['rev-parse', CDUP, TOPLEVEL, ABSOLUTE_GIT_DIR], {
+      cwd,
+    })
+    const [relativeTopLevelDir, topLevel, absoluteGitDir] = revParseOutput.split('\n')
+
     // Unset GIT_DIR before running any git operations in case it's pointing to an incorrect location
     debugLog('Unset GIT_DIR (was `%s`)', process.env.GIT_DIR)
     delete process.env.GIT_DIR
     debugLog('Unset GIT_WORK_TREE (was `%s`)', process.env.GIT_WORK_TREE)
     delete process.env.GIT_WORK_TREE
 
-    const relativeTopLevelDir = await execGit(['rev-parse', '--show-cdup'], { cwd })
     const topLevelDir = normalizePath(path.join(cwd, relativeTopLevelDir))
     debugLog('Resolved git repository top-level directory to be `%s`', topLevelDir)
 
-    const relativeGitConfigDir = await resolveRelativeGitDir(cwd)
+    const relativeGitConfigDir = path.relative(topLevel, absoluteGitDir)
     const gitConfigDir = normalizePath(path.join(topLevelDir, relativeGitConfigDir))
     debugLog('Resolved git config directory to be `%s`', gitConfigDir)
 

package/lib/runAll.js

@@ -302,8 +302,6 @@ export const runAll = async (
     diffFilter,
   })
 
-  logger.log('shouldHidePartiallyStagedFiles', shouldHidePartiallyStagedFiles(ctx))
-
   const runner = new Listr(
     [
       {

package/lib/searchConfigs.js

@@ -15,14 +15,12 @@ const debugLog = debug('lint-staged:searchConfigs')
 
 const EXEC_GIT = ['ls-files', '-z', '--full-name', '-t']
 
-const filterPossibleConfigFiles = (file) => CONFIG_FILE_NAMES.includes(path.basename(file))
+const CONFIG_PATHSPEC = CONFIG_FILE_NAMES.map((f) => `:(glob)**/${f}`)
 
 const numberOfLevels = (file) => file.split('/').length
 
 const sortDeepestParth = (a, b) => (numberOfLevels(a) > numberOfLevels(b) ? -1 : 1)
 
-const isInsideDirectory = (dir) => (file) => file.startsWith(normalizePath(dir))
-
 /**
  * Search all config files from the git repository, preferring those inside `cwd`.
  *
@@ -57,27 +55,37 @@ export const searchConfigs = async (
     return { [configPath]: validateConfig(config, filepath, logger) }
   }
 
-  const [cachedFilesWithStatus, otherFilesWithStatus] = await Promise.all([
-    /** Get all possible config files known to git */
-    execGit(EXEC_GIT, { cwd: topLevelDir }).then(parseGitZOutput),
-    /** Get all possible config files from uncommitted files */
-    execGit([...EXEC_GIT, '--others', '--exclude-standard'], { cwd: topLevelDir }).then(
-      parseGitZOutput
-    ),
-  ])
+  /** Get all possible config files from git (both cached and uncommitted) */
+  const gitListedFiles = await execGit(
+    [
+      ...EXEC_GIT,
+      '--cached', // show all tracked files
+      '--others', // show untracked files
+      '--exclude-standard', // apply standard git exclusions (.gitignore, etc.)
+      '--',
+      ...CONFIG_PATHSPEC,
+    ],
+    { cwd }
+  ).then(parseGitZOutput)
+
+  debugLog('Git listed files matching config files:', gitListedFiles)
 
   /** Sort possible config files so that deepest is first */
-  const possibleConfigFiles = [...cachedFilesWithStatus, ...otherFilesWithStatus]
-    .flatMap(
+  const possibleConfigFiles = gitListedFiles
+    .flatMap((line) => {
       /**
        * Leave out lines starting with "S " to ignore not-checked-out files in a sparse repo.
        * The "S" status means a tracked file that is "skip-worktree"
        * @see https://git-scm.com/docs/git-ls-files#Documentation/git-ls-files.txt--t
-       */ (line) => (line.startsWith('S ') ? [] : [line.replace(/^[HSMRCK?U] /, '')])
-    )
-    .filter(filterPossibleConfigFiles)
-    .map((file) => normalizePath(path.join(topLevelDir, file)))
-    .filter(isInsideDirectory(cwd))
+       */
+      if (line.startsWith('S ')) {
+        return []
+      }
+
+      const relativePath = line.replace(/^[HSMRCK?U] /, '')
+      const absolutePath = normalizePath(path.join(topLevelDir, relativePath))
+      return [absolutePath]
+    })
     .sort(sortDeepestParth)
 
   debugLog('Found possible config files:', possibleConfigFiles)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lint-staged",
-  "version": "16.1.1",
+  "version": "16.1.3",
   "description": "Lint files staged by git",
   "license": "MIT",
   "repository": {
@@ -28,7 +28,10 @@
     "lint-staged": "bin/lint-staged.js"
   },
   "exports": {
-    ".": "./lib/index.js",
+    ".": {
+      "types": "./lib/index.d.ts",
+      "default": "./lib/index.js"
+    },
     "./bin": "./bin/lint-staged.js",
     "./package.json": "./package.json"
   },
@@ -51,7 +54,7 @@
     "commander": "^14.0.0",
     "debug": "^4.4.1",
     "lilconfig": "^3.1.3",
-    "listr2": "^8.3.3",
+    "listr2": "^9.0.1",
     "micromatch": "^4.0.8",
     "nano-spawn": "^1.0.2",
     "pidtree": "^0.6.0",
@@ -60,25 +63,25 @@
   },
   "devDependencies": {
     "@changesets/changelog-github": "0.5.1",
-    "@changesets/cli": "2.29.4",
+    "@changesets/cli": "2.29.5",
     "@commitlint/cli": "19.8.1",
     "@commitlint/config-conventional": "19.8.1",
-    "@eslint/js": "9.29.0",
+    "@eslint/js": "9.32.0",
     "consolemock": "1.1.0",
-    "cross-env": "7.0.3",
-    "eslint": "9.29.0",
-    "eslint-config-prettier": "10.1.5",
-    "eslint-plugin-jest": "28.13.5",
-    "eslint-plugin-n": "17.20.0",
-    "eslint-plugin-prettier": "5.4.1",
+    "cross-env": "10.0.0",
+    "eslint": "9.32.0",
+    "eslint-config-prettier": "10.1.8",
+    "eslint-plugin-jest": "29.0.1",
+    "eslint-plugin-n": "17.21.3",
+    "eslint-plugin-prettier": "5.5.3",
     "eslint-plugin-simple-import-sort": "12.1.1",
     "husky": "9.1.7",
-    "jest": "30.0.0",
+    "jest": "30.0.5",
     "jest-snapshot-serializer-ansi": "2.2.1",
     "mock-stdin": "1.0.0",
-    "prettier": "3.5.3",
+    "prettier": "3.6.2",
     "semver": "7.7.2",
-    "typescript": "5.8.3"
+    "typescript": "5.9.2"
   },
   "keywords": [
     "lint",