lint-staged 10.2.11 → 10.4.0

package/README.md

@@ -189,14 +189,40 @@ For example:
 
 going to execute `eslint` and if it exits with `0` code, it will execute `prettier --write` on all staged `*.js` files.
 
-## Using JS functions to customize tasks
+## Using JS configuration file
 
-When supplying configuration in JS format it is possible to define the task as a function, which will receive an array of staged filenames/paths and should return the complete command as a string. It is also possible to return an array of complete command strings, for example when the task supports only a single file input. The function can be either sync or async.
+Writing the configuration file in JavaScript is the most powerful way to configure _lint-staged_ (`lint-staged.config.js`, [similar](https://github.com/okonet/lint-staged/README.md#configuration), or passed via `--config`). From the configuration file, you can export either a single function, or an object.
+
+If the `exports` value is a function, it will receive an array of all staged filenames. You can then build your own matchers for the files, and return a command string, or an array or command strings. These strings are considered complete and should include the filename arguments, if wanted.
+
+If the `exports` value is an object, its keys should be glob matches (like in the normal non-js config format). The values can either be like in the normal config, or individual functions like described above. Instead of receiving all matched files, the functions in the exported object will only receive the staged files matching the corresponding glob key.
+
+### Function signature
+
+The function can also be async:
 
 ```ts
-type TaskFn = (filenames: string[]) => string | string[] | Promise<string | string[]>
+(filenames: string[]) => string | string[] | Promise<string | string[]>
 ```
 
+### Example: Export a function to build your own matchers
+
+```js
+// lint-staged.config.js
+const micromatch = require('micromatch')
+
+module.exports = (allStagedFiles) => {
+    const shFiles =  micromatch(allStagedFiles, ['**/src/**/*.sh']);
+    if (shFiles.length) {
+      return `printf '%s\n' "Script files aren't allowed in src directory" >&2`
+    }
+    const codeFiles = micromatch(allStagedFiles, ['**/*.js', '**/*.ts']);
+    const docFiles = micromatch(allStagedFiles, ['**/*.md']);
+    return [`eslint ${codeFiles.join(' ')}`, `mdl ${docFiles.join(' ')}`];
+  }
+```
+
+
 ### Example: Wrap filenames in single quotes and run once per file
 
 ```js
@@ -226,6 +252,7 @@ module.exports = {
 ```
 
 ### Example: Use your own globs
+It's better to use the [function-based configuration (seen above)](https://github.com/okonet/lint-staged/README.md#example-export-a-function-to-build-your-own-matchers), if your use case is this.
 
 ```js
 // lint-staged.config.js
@@ -233,8 +260,9 @@ const micromatch = require('micromatch')
 
 module.exports = {
   '*': (allFiles) => {
-    const match = micromatch(allFiles, ['*.js', '*.ts'])
-    return `eslint ${match.join(' ')}`
+    const codeFiles = micromatch(allFiles, ['**/*.js', '**/*.ts']);
+    const docFiles = micromatch(allFiles, ['**/*.md']);
+    return [`eslint ${codeFiles.join(' ')}`, `mdl ${docFiles.join(' ')}`];
   }
 }
 ```

package/bin/lint-staged.js

@@ -4,7 +4,7 @@
 
 // Force colors for packages that depend on https://www.npmjs.com/package/supports-color
 const { supportsColor } = require('chalk')
-if (supportsColor) {
+if (supportsColor && supportsColor.level) {
   process.env.FORCE_COLOR = supportsColor.level.toString()
 }
 

package/lib/formatConfig.js

@@ -0,0 +1,7 @@
+module.exports = function formatConfig(config) {
+  if (typeof config === 'function') {
+    return { '*': config }
+  }
+
+  return config
+}

package/lib/gitWorkflow.js

@@ -53,6 +53,7 @@ const GIT_DIFF_ARGS = [
   '--src-prefix=a/', // force prefix for consistent behaviour
   '--dst-prefix=b/', // force prefix for consistent behaviour
   '--patch', // output a patch that can be applied
+  '--submodule=short', // always use the default short format for submodules
 ]
 const GIT_APPLY_ARGS = ['-v', '--whitespace=nowarn', '--recount', '--unidiff-zero']
 
@@ -99,7 +100,7 @@ class GitWorkflow {
       ctx.errors.add(GetBackupStashError)
       throw new Error('lint-staged automatic backup is missing!')
     }
-    return `stash@{${index}}`
+    return `refs/stash@{${index}}`
   }
 
   /**

package/lib/index.js

@@ -9,6 +9,7 @@ const { PREVENTED_EMPTY_COMMIT, GIT_ERROR, RESTORE_STASH_EXAMPLE } = require('./
 const printTaskOutput = require('./printTaskOutput')
 const runAll = require('./runAll')
 const { ApplyEmptyCommitError, GetBackupStashError, GitError } = require('./symbols')
+const formatConfig = require('./formatConfig')
 const validateConfig = require('./validateConfig')
 
 const errConfigNotFound = new Error('Config could not be found')
@@ -88,7 +89,8 @@ module.exports = async function lintStaged(
     debugLog('Successfully loaded config from `%s`:\n%O', resolved.filepath, resolved.config)
     // resolved.config is the parsed configuration object
     // resolved.filepath is the path to the config file that was found
-    const config = validateConfig(resolved.config)
+    const formattedConfig = formatConfig(resolved.config)
+    const config = validateConfig(formattedConfig)
     if (debug) {
       // Log using logger to be able to test through `consolemock`.
       logger.log('Running lint-staged with the following config:')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lint-staged",
-  "version": "10.2.11",
+  "version": "10.4.0",
   "description": "Lint files staged by git",
   "license": "MIT",
   "repository": "https://github.com/okonet/lint-staged",
@@ -32,15 +32,15 @@
     }
   },
   "dependencies": {
-    "chalk": "^4.0.0",
-    "cli-truncate": "2.1.0",
-    "commander": "^5.1.0",
-    "cosmiconfig": "^6.0.0",
+    "chalk": "^4.1.0",
+    "cli-truncate": "^2.1.0",
+    "commander": "^6.0.0",
+    "cosmiconfig": "^7.0.0",
     "debug": "^4.1.1",
     "dedent": "^0.7.0",
-    "enquirer": "^2.3.5",
-    "execa": "^4.0.1",
-    "listr2": "^2.1.0",
+    "enquirer": "^2.3.6",
+    "execa": "^4.0.3",
+    "listr2": "^2.6.0",
     "log-symbols": "^4.0.0",
     "micromatch": "^4.0.2",
     "normalize-path": "^3.0.0",
@@ -49,22 +49,22 @@
     "stringify-object": "^3.3.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.9.6",
-    "@babel/plugin-proposal-object-rest-spread": "^7.9.6",
-    "@babel/preset-env": "^7.9.6",
+    "@babel/core": "^7.11.4",
+    "@babel/plugin-proposal-object-rest-spread": "^7.11.0",
+    "@babel/preset-env": "^7.11.0",
     "babel-eslint": "10.1.0",
-    "babel-jest": "^26.0.1",
+    "babel-jest": "^26.3.0",
     "consolemock": "^1.1.0",
-    "eslint": "^7.0.0",
+    "eslint": "^7.7.0",
     "eslint-config-prettier": "^6.11.0",
-    "eslint-plugin-import": "^2.20.2",
+    "eslint-plugin-import": "^2.22.0",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^3.1.3",
-    "fs-extra": "^9.0.0",
+    "eslint-plugin-prettier": "^3.1.4",
+    "fs-extra": "^9.0.1",
     "husky": "^4.2.5",
-    "jest": "^26.0.1",
+    "jest": "^26.4.2",
     "jest-snapshot-serializer-ansi": "^1.0.0",
-    "prettier": "^2.0.5"
+    "prettier": "^2.1.0"
   },
   "config": {
     "commitizen": {