lint-staged 16.3.4 → 17.0.0

package/lib/index.js

@@ -1,8 +1,10 @@
+import { assertGitVersion, MIN_GIT_VERSION } from './assertGitVersion.js'
 import { SUPPORTS_COLOR } from './colors.js'
 import { createDebug, enableDebug } from './debug.js'
 import { execGit } from './execGit.js'
 import {
   GIT_ERROR,
+  minGitVersionRequired,
   NO_CONFIGURATION,
   PREVENTED_EMPTY_COMMIT,
   PREVENTED_TASK_MODIFICATIONS,
@@ -86,8 +88,9 @@ const lintStaged = async (
     diff,
     diffFilter,
     failOnChanges = false,
+    hideAll = false,
     hideUnstaged = false,
-    hidePartiallyStaged = !hideUnstaged,
+    hidePartiallyStaged = !(hideAll || hideUnstaged),
     maxArgLength = getMaxArgLength() / 2,
     quiet = false,
     relative = false,
@@ -114,6 +117,10 @@ const lintStaged = async (
   const gitVersion = await execGit(['version', '--build-options'], { cwd })
   debugLog('%s', gitVersion)
 
+  if (!assertGitVersion(gitVersion)) {
+    throw new Error(minGitVersionRequired(MIN_GIT_VERSION, gitVersion), { cause: gitVersion })
+  }
+
   const options = {
     allowEmpty,
     color,
@@ -126,6 +133,7 @@ const lintStaged = async (
     diff,
     diffFilter,
     failOnChanges,
+    hideAll,
     hidePartiallyStaged,
     hideUnstaged,
     maxArgLength,

package/lib/matchFiles.js

@@ -0,0 +1,22 @@
+import picomatch from 'picomatch'
+
+/**
+ * Match list of files against a pattern.
+ *
+ * @param {string} pattern
+ * @param {import('./getStagedFiles.js').StagedFile[]} files
+ */
+export const matchFiles = (files, pattern, cwd = process.cwd()) => {
+  const isMatch = picomatch(pattern, {
+    cwd,
+    dot: true,
+    // If the pattern doesn't look like a path, enable `matchBase` to
+    // match against filenames in every directory. This makes `*.js`
+    // match both `test.js` and `subdirectory/test.js`.
+    matchBase: !pattern.includes('/'),
+    posixSlashes: true,
+    strictBrackets: true,
+  })
+
+  return files.filter((file) => isMatch(file.filepath))
+}

package/lib/messages.js

@@ -67,12 +67,13 @@ export const PREVENTED_EMPTY_COMMIT = `
 `
 
 export const restoreStashExample = (
-  hash = 'h0a0s0h0'
+  hash = '<git-hash>'
 ) => `Any lost modifications can be restored from a git stash:
 
   > git stash list --format="%h %s"
   ${hash} On main: lint-staged automatic backup
-  > git apply --index ${hash}`
+  > git apply --index ${hash}
+`
 
 export const CONFIG_STDIN_ERROR = red(`${error} Failed to read config from stdin.`)
 
@@ -89,3 +90,8 @@ ${error}
 See https://github.com/okonet/lint-staged#configuration.`
 
 export const UNSTAGED_CHANGES_BACKUP_STASH_LOCATION = `Unstaged changes have been kept back in a patch file:`
+
+export const minGitVersionRequired = (expected) =>
+  red(`${error} lint-staged requires at least Git version ${bold(expected)}.
+
+Please update Git: https://git-scm.com/downloads`)

package/lib/runAll.js

@@ -5,7 +5,7 @@ import path from 'node:path'
 import { Listr } from 'listr2'
 
 import { chunkFiles } from './chunkFiles.js'
-import { blackBright } from './colors.js'
+import { dim } from './colors.js'
 import { createDebug } from './debug.js'
 import { execGit } from './execGit.js'
 import { generateTasks } from './generateTasks.js'
@@ -30,7 +30,6 @@ import { normalizePath } from './normalizePath.js'
 import { resolveGitRepo } from './resolveGitRepo.js'
 import { searchConfigs } from './searchConfigs.js'
 import {
-  applyModificationsSkipped,
   cleanupEnabled,
   cleanupSkipped,
   getInitialState,
@@ -39,6 +38,8 @@ import {
   restoreUnstagedChangesSkipped,
   shouldHidePartiallyStagedFiles,
   shouldRestoreUnstagedChanges,
+  shouldRestoreUntrackedFiles,
+  updateIndexSkipped,
 } from './state.js'
 import { ConfigNotFoundError, GetStagedFilesError, GitError, GitRepoError } from './symbols.js'
 
@@ -90,8 +91,9 @@ export const runAll = async (
     diff,
     diffFilter,
     failOnChanges = false,
+    hideAll = false,
     hideUnstaged = false,
-    hidePartiallyStaged = !hideUnstaged,
+    hidePartiallyStaged = !(hideAll || hideUnstaged),
     maxArgLength,
     quiet = false,
     relative = false,
@@ -112,8 +114,9 @@ export const runAll = async (
 
   const ctx = getInitialState({
     failOnChanges,
-    hidePartiallyStaged,
+    hideAll,
     hideUnstaged,
+    hidePartiallyStaged,
     quiet,
     revert,
   })
@@ -138,7 +141,7 @@ export const runAll = async (
     logger.warn(skippingBackup(hasInitialCommit, diff))
   }
 
-  if (!ctx.shouldHidePartiallyStaged && !ctx.shouldHideUnstaged && !quiet) {
+  if (!ctx.shouldHidePartiallyStaged && !ctx.shouldHideUnstaged && !ctx.shouldHideAll && !quiet) {
     logger.warn(SKIPPING_HIDE_PARTIALLY_CHANGED)
   }
 
@@ -204,7 +207,7 @@ export const runAll = async (
     // Use actual cwd if it's specified, or there's only a single config file.
     // Otherwise use the directory of the config file for each config group,
     // to make sure tasks are separated from each other.
-    const groupCwd = hasMultipleConfigs && !hasExplicitCwd ? path.dirname(configPath) : cwd
+    const groupCwd = hasExplicitCwd || !hasMultipleConfigs ? cwd : path.dirname(configPath)
 
     const chunkCount = stagedFileChunks.length
     if (chunkCount > 1) {
@@ -248,7 +251,7 @@ export const runAll = async (
             const fileCount = task.fileList.length
 
             return {
-              title: `${task.pattern}${blackBright(
+              title: `${task.pattern}${dim(
                 ` — ${fileCount} ${fileCount === 1 ? 'file' : 'files'}`
               )}`,
               task: async (ctx, task) =>
@@ -260,7 +263,7 @@ export const runAll = async (
               skip: () => {
                 // Skip task when no files matched
                 if (fileCount === 0) {
-                  return `${task.pattern}${blackBright(' — no files')}`
+                  return `${task.pattern}${dim(' — no files')}`
                 }
                 return false
               },
@@ -271,8 +274,8 @@ export const runAll = async (
 
       listrTasks.push({
         title:
-          `${configName}${blackBright(` — ${files.length} ${files.length > 1 ? 'files' : 'file'}`)}` +
-          (chunkCount > 1 ? blackBright(` (chunk ${index + 1}/${chunkCount})...`) : ''),
+          `${configName}${dim(` — ${files.length} ${files.length > 1 ? 'files' : 'file'}`)}` +
+          (chunkCount > 1 ? dim(` (chunk ${index + 1}/${chunkCount})...`) : ''),
         task: (ctx, task) =>
           task.newListr(chunkListrTasks, { concurrent, exitOnError: !continueOnError }),
         skip: () => {
@@ -280,7 +283,7 @@ export const runAll = async (
           if (ctx.errors.has(GitError)) return SKIPPED_GIT_ERROR
           // Skip chunk when no every task is skipped (due to no matches)
           if (chunkListrTasks.every((task) => task.skip())) {
-            return `${configName}${blackBright(' — no tasks to run')}`
+            return `${configName}${dim(' — no tasks to run')}`
           }
           return false
         },
@@ -299,23 +302,12 @@ export const runAll = async (
     return ctx
   }
 
-  // Chunk matched files for better Windows compatibility
-  /** @type {import('./getStagedFiles.js').StagedFile[][]} */
-  const matchedFileChunks = chunkFiles({
-    // matched files are relative to `cwd`, not `topLevelDir`, when `relative` is used
-    baseDir: cwd,
-    files: Array.from(matchedFiles),
-    maxArgLength,
-    relative: false,
-  })
-
   const git = new GitWorkflow({
     allowEmpty,
     diff,
     diffFilter,
     failOnChanges,
     gitConfigDir,
-    matchedFileChunks,
     topLevelDir,
   })
 
@@ -336,9 +328,9 @@ export const runAll = async (
         skip: () => listrTasks.every((task) => task.skip()),
       },
       {
-        title: 'Applying modifications from tasks...',
-        task: (ctx) => git.applyModifications(ctx),
-        skip: applyModificationsSkipped,
+        title: 'Updating Git index again...',
+        task: (ctx) => git.updateIndex(ctx),
+        skip: updateIndexSkipped,
       },
       {
         title: 'Restoring unstaged changes...',
@@ -346,6 +338,12 @@ export const runAll = async (
         enabled: shouldRestoreUnstagedChanges,
         skip: restoreUnstagedChangesSkipped,
       },
+      {
+        title: 'Restoring untracked files...',
+        task: (ctx) => git.restoreUntrackedFiles(ctx),
+        enabled: shouldRestoreUntrackedFiles,
+        skip: restoreUnstagedChangesSkipped,
+      },
       {
         title: 'Reverting to original state because of errors...',
         task: (ctx) => git.restoreOriginalState(ctx),

package/lib/state.js

@@ -9,32 +9,48 @@ import {
 
 export const getInitialState = ({
   failOnChanges = false,
+  hideAll = false,
   hideUnstaged = false,
-  hidePartiallyStaged = !hideUnstaged,
+  hidePartiallyStaged = !(hideAll || hideUnstaged),
   quiet = false,
   revert = true,
-} = {}) => ({
-  backupHash: null,
-  errors: new Set([]),
-  shouldFailOnChanges: failOnChanges,
-  hasFilesToHide: null,
-  output: [],
-  quiet,
-  shouldBackup: null,
-  shouldHidePartiallyStaged: hidePartiallyStaged,
-  shouldHideUnstaged: hideUnstaged,
-  shouldRevert: revert,
-  unstagedDiffSha256: null,
-  unstagedPatch: null,
-})
+} = {}) => {
+  const initialState = {
+    backupHash: null,
+    errors: new Set([]),
+    shouldFailOnChanges: failOnChanges,
+    hasFilesToHide: null,
+    output: [],
+    quiet,
+    shouldBackup: null,
+    shouldHideAll: hideAll,
+    shouldHideUnstaged: hideUnstaged,
+    shouldHidePartiallyStaged: hidePartiallyStaged,
+    shouldRevert: revert,
+    unstagedDiffSha256: null,
+    unstagedPatch: null,
+  }
+
+  if (initialState.shouldHideAll) {
+    initialState.shouldHideUnstaged = false // becomes redundant
+    initialState.shouldHidePartiallyStaged = false // becomes redundant
+  } else if (initialState.shouldHideUnstaged) {
+    initialState.shouldHidePartiallyStaged = false // becomes redundant
+  }
+
+  return initialState
+}
 
 export const shouldHidePartiallyStagedFiles = (ctx) =>
   ctx.shouldHidePartiallyStaged && ctx.hasFilesToHide
 
 export const shouldRestoreUnstagedChanges = (ctx) =>
-  (ctx.shouldHideUnstaged || ctx.shouldHidePartiallyStaged) && ctx.hasFilesToHide
+  (ctx.shouldHideAll || ctx.shouldHideUnstaged || ctx.shouldHidePartiallyStaged) &&
+  ctx.hasFilesToHide
+
+export const shouldRestoreUntrackedFiles = (ctx) => !!ctx.shouldHideAll
 
-export const applyModificationsSkipped = (ctx) => {
+export const updateIndexSkipped = (ctx) => {
   // Always apply back unstaged modifications when skipping revert or backup
   if (!ctx.shouldRevert || !ctx.shouldBackup) return false
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lint-staged",
-  "version": "16.3.4",
+  "version": "17.0.0",
   "description": "Lint files staged by git",
   "license": "MIT",
   "repository": {
@@ -19,7 +19,7 @@
     "url": "https://opencollective.com/lint-staged"
   },
   "engines": {
-    "node": ">=20.17"
+    "node": ">=22.22.1"
   },
   "type": "module",
   "bin": {
@@ -48,34 +48,34 @@
     "tag": "npx changeset tag"
   },
   "dependencies": {
-    "commander": "^14.0.3",
-    "listr2": "^9.0.5",
-    "micromatch": "^4.0.8",
+    "listr2": "^10.2.1",
+    "picomatch": "^4.0.4",
     "string-argv": "^0.3.2",
-    "tinyexec": "^1.0.4",
-    "yaml": "^2.8.2"
+    "tinyexec": "^1.1.2"
+  },
+  "optionalDependencies": {
+    "yaml": "^2.8.4"
   },
   "devDependencies": {
-    "@changesets/changelog-github": "0.6.0",
-    "@changesets/cli": "2.30.0",
-    "@commitlint/cli": "20.4.4",
-    "@commitlint/config-conventional": "20.4.4",
+    "@changesets/changelog-github": "0.7.0",
+    "@changesets/cli": "2.31.0",
+    "@commitlint/cli": "20.5.3",
+    "@commitlint/config-conventional": "20.5.3",
     "@eslint/js": "10.0.1",
-    "@vitest/coverage-v8": "4.0.18",
-    "@vitest/eslint-plugin": "1.6.9",
+    "@vitest/coverage-istanbul": "4.1.5",
+    "@vitest/eslint-plugin": "1.6.16",
     "consolemock": "1.1.0",
     "cross-env": "10.1.0",
-    "eslint": "10.0.2",
+    "eslint": "10.3.0",
     "eslint-config-prettier": "10.1.8",
-    "eslint-plugin-n": "17.24.0",
+    "eslint-plugin-n": "18.0.1",
     "eslint-plugin-prettier": "5.5.5",
-    "eslint-plugin-simple-import-sort": "12.1.1",
+    "eslint-plugin-simple-import-sort": "13.0.0",
     "husky": "9.1.7",
     "mock-stdin": "1.0.0",
-    "prettier": "3.8.1",
+    "prettier": "3.8.3",
     "semver": "7.7.4",
-    "typescript": "5.9.3",
-    "vitest": "4.0.18"
+    "vitest": "4.1.5"
   },
   "keywords": [
     "lint",