lint-staged 15.2.4 → 15.2.6

package/lib/loadConfig.js

@@ -7,6 +7,7 @@ import debug from 'debug'
 import YAML from 'yaml'
 
 import { dynamicImport } from './dynamicImport.js'
+import { failedToLoadConfig } from './messages.js'
 import { resolveConfig } from './resolveConfig.js'
 import {
   CONFIG_FILE_NAMES,
@@ -117,8 +118,8 @@ export const loadConfig = async ({ configPath, cwd }, logger) => {
 
     return { config, filepath }
   } catch (error) {
-    debugLog('Failed to load configuration!')
-    logger.error(error)
+    debugLog('Failed to load configuration from `%s` with error:\n', configPath, error)
+    logger.error(failedToLoadConfig(configPath))
     return {}
   }
 }

package/lib/messages.js

@@ -85,3 +85,15 @@ export const RESTORE_STASH_EXAMPLE = `  Any lost modifications can be restored f
 `
 
 export const CONFIG_STDIN_ERROR = chalk.redBright(`${error} Failed to read config from stdin.`)
+
+export const failedToLoadConfig = (filepath) =>
+  chalk.redBright(`${error} Failed to read config from file "${filepath}".`)
+
+export const failedToParseConfig = (
+  filepath,
+  error
+) => `${chalk.redBright(`${error} Failed to parse config from file "${filepath}".`)}
+
+${error}
+
+See https://github.com/okonet/lint-staged#configuration.`

package/lib/resolveGitRepo.js

@@ -1,54 +1,10 @@
-import fs from 'node:fs/promises'
-import path from 'node:path'
-
 import debug from 'debug'
 
 import { execGit } from './execGit.js'
-import { readFile } from './file.js'
 import { normalizePath } from './normalizePath.js'
 
 const debugLog = debug('lint-staged:resolveGitRepo')
 
-/**
- * Resolve path to the .git directory, with special handling for
- * submodules and worktrees
- */
-const resolveGitConfigDir = async (gitDir) => {
-  // Get the real path in case it's a symlink
-  const defaultDir = path.join(gitDir, '.git')
-  const stats = await fs.lstat(defaultDir)
-
-  // If .git is a directory, use it
-  if (stats.isDirectory()) {
-    return defaultDir
-  }
-
-  // If .git is a symlink, return the real location
-  if (stats.isSymbolicLink()) {
-    return await fs.realpath(gitDir)
-  }
-
-  // Otherwise .git is a file containing path to real location
-  const file = (await readFile(defaultDir)).toString()
-  return path.resolve(gitDir, file.replace(/^gitdir: /, '')).trim()
-}
-
-// exported for test
-export const determineGitDir = (cwd, relativeDir) => {
-  // if relative dir and cwd have different endings normalize it
-  // this happens under windows, where normalize is unable to normalize git's output
-  if (relativeDir && relativeDir.endsWith(path.sep)) {
-    relativeDir = relativeDir.slice(0, -1)
-  }
-  if (relativeDir) {
-    // the current working dir is inside the git top-level directory
-    return cwd.substring(0, cwd.lastIndexOf(relativeDir))
-  } else {
-    // the current working dir is the top-level git directory
-    return cwd
-  }
-}
-
 /**
  * Resolve git directory and possible submodule paths
  */
@@ -62,13 +18,14 @@ export const resolveGitRepo = async (cwd = process.cwd()) => {
     debugLog('Unset GIT_WORK_TREE (was `%s`)', process.env.GIT_WORK_TREE)
     delete process.env.GIT_WORK_TREE
 
-    // read the path of the current directory relative to the top-level directory
-    // don't read the toplevel directly, it will lead to an posix conform path on non posix systems (cygwin)
-    const gitRel = normalizePath(await execGit(['rev-parse', '--show-prefix'], { cwd }))
-    const gitDir = normalizePath(determineGitDir(normalizePath(cwd), gitRel))
-    const gitConfigDir = normalizePath(await resolveGitConfigDir(gitDir))
-
+    const gitDir = normalizePath(
+      await execGit(['rev-parse', '--path-format=absolute', '--show-toplevel'], { cwd })
+    )
     debugLog('Resolved git directory to be `%s`', gitDir)
+
+    const gitConfigDir = normalizePath(
+      await execGit(['rev-parse', '--path-format=absolute', '--absolute-git-dir'], { cwd })
+    )
     debugLog('Resolved git config directory to be `%s`', gitConfigDir)
 
     return { gitDir, gitConfigDir }

package/lib/validateConfig.js

@@ -4,7 +4,7 @@ import { inspect } from 'node:util'
 
 import debug from 'debug'
 
-import { configurationError } from './messages.js'
+import { configurationError, failedToParseConfig } from './messages.js'
 import { ConfigEmptyError, ConfigFormatError } from './symbols.js'
 import { validateBraces } from './validateBraces.js'
 
@@ -23,14 +23,7 @@ const TEST_DEPRECATED_KEYS = new Map([
   ['relative', (key) => typeof key === 'boolean'],
 ])
 
-/**
- * Runs config validation. Throws error if the config is not valid.
- * @param {Object} config
- * @param {string} configPath
- * @param {Logger} logger
- * @returns {Object} config
- */
-export const validateConfig = (config, configPath, logger) => {
+export const validateConfigLogic = (config, configPath, logger) => {
   debugLog('Validating config from `%s`...', configPath)
 
   if (!config || (typeof config !== 'object' && typeof config !== 'function')) {
@@ -100,11 +93,7 @@ export const validateConfig = (config, configPath, logger) => {
   if (errors.length) {
     const message = errors.join('\n\n')
 
-    logger.error(`Could not parse lint-staged config.
-
-${message}
-
-See https://github.com/okonet/lint-staged#configuration.`)
+    logger.error(failedToParseConfig(configPath, message))
 
     throw new Error(message)
   }
@@ -114,3 +103,19 @@ See https://github.com/okonet/lint-staged#configuration.`)
 
   return validatedConfig
 }
+
+/**
+ * Runs config validation. Throws error if the config is not valid.
+ * @param {Object} config
+ * @param {string} configPath
+ * @param {Logger} logger
+ * @returns {Object} config
+ */
+export const validateConfig = (config, configPath, logger) => {
+  try {
+    return validateConfigLogic(config, configPath, logger)
+  } catch (error) {
+    logger.error(failedToParseConfig(configPath, error))
+    throw error
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lint-staged",
-  "version": "15.2.4",
+  "version": "15.2.6",
   "description": "Lint files staged by git",
   "license": "MIT",
   "repository": "https://github.com/okonet/lint-staged",
@@ -36,16 +36,16 @@
     "tag": "npx changeset tag"
   },
   "dependencies": {
-    "chalk": "5.3.0",
-    "commander": "12.1.0",
-    "debug": "4.3.4",
-    "execa": "8.0.1",
-    "lilconfig": "3.1.1",
-    "listr2": "8.2.1",
-    "micromatch": "4.0.6",
-    "pidtree": "0.6.0",
-    "string-argv": "0.3.2",
-    "yaml": "2.4.2"
+    "chalk": "~5.3.0",
+    "commander": "~12.1.0",
+    "debug": "~4.3.4",
+    "execa": "~8.0.1",
+    "lilconfig": "~3.1.1",
+    "listr2": "~8.2.1",
+    "micromatch": "~4.0.7",
+    "pidtree": "~0.6.0",
+    "string-argv": "~0.3.2",
+    "yaml": "~2.4.2"
   },
   "devDependencies": {
     "@changesets/changelog-github": "0.5.0",