lint-staged 7.1.0 → 7.2.0

package/README.md

@@ -71,12 +71,12 @@ $ ./node_modules/.bin/lint-staged --help
   Options:
 
     -V, --version        output the version number
-    -c, --config [path]  Path to configuration file
+    -c, --config [path]  Configuration file path or package
     -d, --debug          Enable debug mode
     -h, --help           output usage information
 ```
 
-* **`--config [path]`**: This can be used to manually specify the `lint-staged` config file location. However, if the specified file cannot be found, it will error out instead of performing the usual search.
+* **`--config [path]`**: This can be used to manually specify the `lint-staged` config file location. However, if the specified file cannot be found, it will error out instead of performing the usual search. You may pass a npm package name for configuration also.
 * **`--debug`**: Enabling the debug mode does the following:
   * `lint-staged` uses the [debug](https://github.com/visionmedia/debug) module internally to log information about staged files, commands being executed, location of binaries etc. Debug logs, which are automatically enabled by passing the flag, can also be enabled by setting the environment variable `$DEBUG` to `lint-staged*`.
   * Use the [`verbose` renderer](https://github.com/SamVerschueren/listr-verbose-renderer) for `listr`.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lint-staged",
-  "version": "7.1.0",
+  "version": "7.2.0",
   "description": "Lint files staged by git",
   "license": "MIT",
   "repository": "https://github.com/okonet/lint-staged",
@@ -21,9 +21,9 @@
     "precommit": "node index.js",
     "cz": "git-cz",
     "lint:base": "eslint --rule \"prettier/prettier: 2\"",
-    "lint": "yarn lint:base -- .",
-    "lint:fix": "yarn lint --fix",
-    "pretest": "yarn lint",
+    "lint": "npm run lint:base -- .",
+    "lint:fix": "npm run lint --fix",
+    "pretest": "npm run lint",
     "test": "jest --coverage",
     "test:watch": "jest --watch"
   },
@@ -31,15 +31,15 @@
     "app-root-path": "^2.0.1",
     "chalk": "^2.3.1",
     "commander": "^2.14.1",
-    "cosmiconfig": "^4.0.0",
+    "cosmiconfig": "^5.0.2",
     "debug": "^3.1.0",
     "dedent": "^0.7.0",
     "execa": "^0.9.0",
     "find-parent-dir": "^0.3.0",
     "is-glob": "^4.0.0",
     "is-windows": "^1.0.2",
-    "jest-validate": "^22.4.0",
-    "listr": "^0.13.0",
+    "jest-validate": "^23.0.0",
+    "listr": "^0.14.1",
     "lodash": "^4.17.5",
     "log-symbols": "^2.2.0",
     "micromatch": "^3.1.8",

package/src/index.js

@@ -13,25 +13,42 @@ const debug = require('debug')('lint-staged')
 // but do this only in TTY mode
 if (process.stdout.isTTY) {
   // istanbul ignore next
-  process.env.FORCE_COLOR = true
+  process.env.FORCE_COLOR = '1'
 }
 
 const errConfigNotFound = new Error('Config could not be found')
 
+function resolveConfig(configPath) {
+  try {
+    return require.resolve(configPath)
+  } catch (ignore) {
+    return configPath
+  }
+}
+
+function loadConfig(configPath) {
+  const explorer = cosmiconfig('lint-staged', {
+    searchPlaces: [
+      'package.json',
+      '.lintstagedrc',
+      '.lintstagedrc.json',
+      '.lintstagedrc.yaml',
+      '.lintstagedrc.yml',
+      '.lintstagedrc.js',
+      'lint-staged.config.js'
+    ]
+  })
+
+  return configPath ? explorer.load(resolveConfig(configPath)) : explorer.search()
+}
+
 /**
  * Root lint-staged function that is called from .bin
  */
 module.exports = function lintStaged(logger = console, configPath, debugMode) {
   debug('Loading config using `cosmiconfig`')
 
-  const explorer = cosmiconfig('lint-staged', {
-    configPath,
-    rc: '.lintstagedrc',
-    rcExtensions: true
-  })
-
-  return explorer
-    .load()
+  return loadConfig(configPath)
     .then(result => {
       if (result == null) throw errConfigNotFound
 
@@ -53,15 +70,15 @@ module.exports = function lintStaged(logger = console, configPath, debugMode) {
         .then(() => {
           debug('linters were executed successfully!')
           // No errors, exiting with 0
-          process.exitCode = 0
         })
         .catch(error => {
           // Errors detected, printing and exiting with non-zero
-          printErrors(error)
           process.exitCode = 1
+          printErrors(error)
         })
     })
     .catch(err => {
+      process.exitCode = 1
       if (err === errConfigNotFound) {
         logger.error(`${err.message}.`)
       } else {
@@ -78,6 +95,5 @@ module.exports = function lintStaged(logger = console, configPath, debugMode) {
         Please make sure you have created it correctly.
         See https://github.com/okonet/lint-staged#configuration.
       `)
-      process.exitCode = 1
     })
 }