lint-staged 11.2.0 → 11.2.4

package/README.md

@@ -105,7 +105,7 @@ Starting with v3.1 you can now use different ways of configuring lint-staged:
 - `lint-staged.config.js`, `.lintstagedrc.js`, or `.lintstagedrc.cjs` file in JS format
 - Pass a configuration file using the `--config` or `-c` flag
 
-See [cosmiconfig](https://github.com/davidtheclark/cosmiconfig) for more details on what formats are supported.
+See [lilconfig](https://github.com/antonk52/lilconfig) for more details on what formats are supported.
 
 Configuration should be an object where each value is a command to run and its key is a glob pattern to use for this command. This package uses [micromatch](https://github.com/micromatch/micromatch) for glob patterns.
 

package/lib/index.js

@@ -1,6 +1,7 @@
 'use strict'
 
-const { cosmiconfig } = require('cosmiconfig')
+const { lilconfig } = require('lilconfig')
+const { yaml } = require('js-yaml')
 const debugLog = require('debug')('lint-staged')
 const stringifyObject = require('stringify-object')
 
@@ -24,8 +25,10 @@ const resolveConfig = (configPath) => {
   }
 }
 
+const jsYamlLoad = (filepath, content) => yaml.load(content)
+
 const loadConfig = (configPath) => {
-  const explorer = cosmiconfig('lint-staged', {
+  const explorer = lilconfig('lint-staged', {
     searchPlaces: [
       'package.json',
       '.lintstagedrc',
@@ -37,6 +40,11 @@ const loadConfig = (configPath) => {
       'lint-staged.config.js',
       'lint-staged.config.cjs',
     ],
+    loaders: {
+      '.yml': jsYamlLoad,
+      '.yaml': jsYamlLoad,
+      noExt: jsYamlLoad,
+    },
   })
 
   return configPath ? explorer.load(resolveConfig(configPath)) : explorer.search()
@@ -84,7 +92,7 @@ const lintStaged = async (
 ) => {
   await validateOptions({ shell }, logger)
 
-  debugLog('Loading config using `cosmiconfig`')
+  debugLog('Loading config using `lilconfig`')
 
   const resolved = configObject
     ? { config: configObject, filepath: '(input)' }

package/lib/resolveGitRepo.js

@@ -25,10 +25,25 @@ const resolveGitConfigDir = async (gitDir) => {
   return path.resolve(gitDir, file.replace(/^gitdir: /, '')).trim()
 }
 
+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 normalize(cwd.substring(0, cwd.lastIndexOf(relativeDir)))
+  } else {
+    // the current working dir is the top-level git directory
+    return normalize(cwd)
+  }
+}
+
 /**
  * Resolve git directory and possible submodule paths
  */
-const resolveGitRepo = async (cwd) => {
+const resolveGitRepo = async (cwd = process.cwd()) => {
   try {
     debugLog('Resolving git repo from `%s`', cwd)
 
@@ -38,7 +53,10 @@ const resolveGitRepo = async (cwd) => {
     debugLog('Unset GIT_WORK_TREE (was `%s`)', process.env.GIT_WORK_TREE)
     delete process.env.GIT_WORK_TREE
 
-    const gitDir = normalize(await execGit(['rev-parse', '--show-toplevel'], { cwd }))
+    // 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 = normalize(await execGit(['rev-parse', '--show-prefix']))
+    const gitDir = determineGitDir(normalize(cwd), gitRel)
     const gitConfigDir = normalize(await resolveGitConfigDir(gitDir))
 
     debugLog('Resolved git directory to be `%s`', gitDir)
@@ -52,3 +70,6 @@ const resolveGitRepo = async (cwd) => {
 }
 
 module.exports = resolveGitRepo
+
+// exported for test
+module.exports.determineGitDir = determineGitDir

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lint-staged",
-  "version": "11.2.0",
+  "version": "11.2.4",
   "description": "Lint files staged by git",
   "license": "MIT",
   "repository": "https://github.com/okonet/lint-staged",
@@ -30,10 +30,11 @@
     "cli-truncate": "2.1.0",
     "colorette": "^1.4.0",
     "commander": "^8.2.0",
-    "cosmiconfig": "^7.0.1",
     "debug": "^4.3.2",
     "enquirer": "^2.3.6",
     "execa": "^5.1.1",
+    "js-yaml": "^4.1.0",
+    "lilconfig": "^2.0.3",
     "listr2": "^3.12.2",
     "micromatch": "^4.0.4",
     "normalize-path": "^3.0.0",