lint-staged 12.1.1 → 12.1.5

package/bin/lint-staged.js

@@ -44,10 +44,13 @@ cmdline
   )
   .parse(process.argv)
 
-const debugLog = debug('lint-staged:bin')
-if (cmdline.debug) {
+const cmdlineOptions = cmdline.opts()
+
+if (cmdlineOptions.debug) {
   debug.enable('lint-staged*')
 }
+
+const debugLog = debug('lint-staged:bin')
 debugLog('Running `lint-staged@%s`', version)
 
 /**
@@ -68,8 +71,6 @@ const getMaxArgLength = () => {
   }
 }
 
-const cmdlineOptions = cmdline.opts()
-
 const options = {
   allowEmpty: !!cmdlineOptions.allowEmpty,
   concurrent: JSON.parse(cmdlineOptions.concurrent),

package/lib/index.js

@@ -58,20 +58,14 @@ const lintStaged = async (
 ) => {
   await validateOptions({ shell }, logger)
 
-  debugLog('Loading config using `lilconfig`')
+  const inputConfig = configObject || (await loadConfig({ configPath, cwd }, logger))
 
-  const resolved = configObject
-    ? { config: configObject, filepath: '(input)' }
-    : await loadConfig(configPath)
-
-  if (!resolved) {
+  if (!inputConfig) {
     logger.error(`${ConfigNotFoundError.message}.`)
     throw ConfigNotFoundError
   }
 
-  debugLog('Successfully loaded config from `%s`:\n%O', resolved.filepath, resolved.config)
-
-  const config = validateConfig(resolved.config, logger)
+  const config = validateConfig(inputConfig, logger)
 
   if (debug) {
     // Log using logger to be able to test through `consolemock`.

package/lib/loadConfig.js

@@ -1,6 +1,13 @@
+/** @typedef {import('./index').Logger} Logger */
+
+import { pathToFileURL } from 'url'
+
+import debug from 'debug'
 import { lilconfig } from 'lilconfig'
 import YAML from 'yaml'
 
+const debugLog = debug('lint-staged:loadConfig')
+
 /**
  * The list of files `lint-staged` will read configuration
  * from, in the declared order.
@@ -20,16 +27,12 @@ const searchPlaces = [
 ]
 
 /** exported for tests */
-export const dynamicImport = (path) =>
-  import(path)
-    .then((module) => module.default)
-    .catch((error) => {
-      console.error(error)
-      throw error
-    })
+export const dynamicImport = (path) => import(pathToFileURL(path)).then((module) => module.default)
 
 const jsonParse = (path, content) => JSON.parse(content)
 
+const yamlParse = (path, content) => YAML.parse(content)
+
 /**
  * `lilconfig` doesn't support yaml files by default,
  * so we add custom loaders for those. Files without
@@ -41,9 +44,9 @@ const loaders = {
   '.json': jsonParse,
   '.mjs': dynamicImport,
   '.cjs': dynamicImport,
-  '.yaml': YAML.parse,
-  '.yml': YAML.parse,
-  noExt: YAML.parse,
+  '.yaml': yamlParse,
+  '.yml': yamlParse,
+  noExt: yamlParse,
 }
 
 const resolveConfig = (configPath) => {
@@ -55,15 +58,34 @@ const resolveConfig = (configPath) => {
 }
 
 /**
- * @param {string} [configPath]
+ * @param {object} options
+ * @param {string} [options.configPath] - Explicit path to a config file
+ * @param {string} [options.cwd] - Current working directory
  */
-export const loadConfig = async (configPath) => {
-  const explorer = lilconfig('lint-staged', { searchPlaces, loaders })
-  const result = await (configPath ? explorer.load(resolveConfig(configPath)) : explorer.search())
-  if (!result) return null
+export const loadConfig = async ({ configPath, cwd }, logger) => {
+  try {
+    if (configPath) {
+      debugLog('Loading configuration from `%s`...', configPath)
+    } else {
+      debugLog('Searching for configuration from `%s`...', cwd)
+    }
 
-  const { config, filepath } = result
+    const explorer = lilconfig('lint-staged', { searchPlaces, loaders })
 
-  // config is a promise when using the `dynamicImport` loader
-  return { config: await config, filepath }
+    const result = await (configPath
+      ? explorer.load(resolveConfig(configPath))
+      : explorer.search(cwd))
+    if (!result) return null
+
+    // config is a promise when using the `dynamicImport` loader
+    const config = await result.config
+
+    debugLog('Successfully loaded config from `%s`:\n%O', result.filepath, config)
+
+    return config
+  } catch (error) {
+    debugLog('Failed to load configuration!')
+    logger.error(error)
+    return null
+  }
 }

package/lib/resolveGitRepo.js

@@ -54,7 +54,7 @@ export const resolveGitRepo = async (cwd = process.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 gitRel = normalize(await execGit(['rev-parse', '--show-prefix'], { cwd }))
     const gitDir = determineGitDir(normalize(cwd), gitRel)
     const gitConfigDir = normalize(await resolveGitConfigDir(gitDir))
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lint-staged",
-  "version": "12.1.1",
+  "version": "12.1.5",
   "description": "Lint files staged by git",
   "license": "MIT",
   "repository": "https://github.com/okonet/lint-staged",
@@ -32,34 +32,33 @@
     "cli-truncate": "^3.1.0",
     "colorette": "^2.0.16",
     "commander": "^8.3.0",
-    "debug": "^4.3.2",
-    "enquirer": "^2.3.6",
+    "debug": "^4.3.3",
     "execa": "^5.1.1",
     "lilconfig": "2.0.4",
-    "listr2": "^3.13.3",
+    "listr2": "^3.13.5",
     "micromatch": "^4.0.4",
     "normalize-path": "^3.0.0",
-    "object-inspect": "^1.11.0",
+    "object-inspect": "^1.11.1",
     "string-argv": "^0.3.1",
-    "supports-color": "^9.0.2",
+    "supports-color": "^9.2.1",
     "yaml": "^1.10.2"
   },
   "devDependencies": {
-    "@babel/core": "^7.16.0",
-    "@babel/eslint-parser": "^7.16.3",
-    "@babel/preset-env": "^7.16.0",
-    "babel-jest": "^27.3.1",
+    "@babel/core": "^7.16.5",
+    "@babel/eslint-parser": "^7.16.5",
+    "@babel/preset-env": "^7.16.5",
+    "babel-jest": "^27.4.5",
     "consolemock": "^1.1.0",
-    "eslint": "^8.2.0",
+    "eslint": "^8.4.1",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-import": "^2.25.3",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^4.0.0",
     "fs-extra": "^10.0.0",
     "husky": "^7.0.4",
-    "jest": "^27.3.1",
+    "jest": "^27.4.5",
     "jest-snapshot-serializer-ansi": "^1.0.0",
-    "prettier": "^2.4.1"
+    "prettier": "^2.5.1"
   },
   "keywords": [
     "lint",