From 9660b11f8ed156d55b83b10e19ad24a7cc306edf Mon Sep 17 00:00:00 2001
From: Masafumi Koba <473530+ybiquitous@users.noreply.github.com>
Date: Wed, 3 Jul 2019 00:50:34 +0900
Subject: [PATCH] feat(lint-staged): make settings more simple (#440)

BREAKING CHANGE: the `lint-staged` field structure in `package.json` is changed
---
 package.json                               | 26 +++++++++-------------
 test/fixtures/package-empty_expected.json  |  9 +++-----
 test/fixtures/package-normal_expected.json |  9 +++-----
 3 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/package.json b/package.json
index 06ba8869..529a7a99 100644
--- a/package.json
+++ b/package.json
@@ -68,21 +68,16 @@
     }
   },
   "lint-staged": {
-    "linters": {
-      "*.{js,jsx,mjs,ts,tsx}": [
-        "eslint --fix --no-ignore",
-        "git add"
-      ],
-      "*.md": [
-        "remark --frail"
-      ],
-      "*.{css,html,js,json,jsx,md,mdx,mjs,scss,ts,tsx,yaml,yml}": [
-        "prettier --write",
-        "git add"
-      ]
-    },
-    "ignore": [
-      "CHANGELOG.md"
+    "*.{js,jsx,mjs,ts,tsx}": [
+      "eslint --fix --no-ignore",
+      "git add"
+    ],
+    "!(CHANGELOG).md": [
+      "remark --frail"
+    ],
+    "*.{css,html,js,json,jsx,md,mdx,mjs,scss,ts,tsx,yaml,yml}": [
+      "prettier --write",
+      "git add"
     ]
   },
   "prettier": {
@@ -126,6 +121,7 @@
           "editorconfig",
           "eslint",
           "init",
+          "lint-staged",
           "package",
           "prettier",
           "readme",
diff --git a/test/fixtures/package-empty_expected.json b/test/fixtures/package-empty_expected.json
index 8c957099..19d3aff7 100644
--- a/test/fixtures/package-empty_expected.json
+++ b/test/fixtures/package-empty_expected.json
@@ -22,12 +22,9 @@
     }
   },
   "lint-staged": {
-    "linters": {
-      "*.{js,jsx,mjs,ts,tsx}": ["eslint --fix --no-ignore", "git add"],
-      "*.md": ["remark --frail"],
-      "*.{css,html,js,json,jsx,md,mdx,mjs,scss,ts,tsx,yaml,yml}": ["prettier --write", "git add"]
-    },
-    "ignore": ["CHANGELOG.md"]
+    "*.{js,jsx,mjs,ts,tsx}": ["eslint --fix --no-ignore", "git add"],
+    "!(CHANGELOG).md": ["remark --frail"],
+    "*.{css,html,js,json,jsx,md,mdx,mjs,scss,ts,tsx,yaml,yml}": ["prettier --write", "git add"]
   },
   "standard-version": {
     "scripts": {
diff --git a/test/fixtures/package-normal_expected.json b/test/fixtures/package-normal_expected.json
index 6f5fb44e..59e7bde9 100644
--- a/test/fixtures/package-normal_expected.json
+++ b/test/fixtures/package-normal_expected.json
@@ -23,12 +23,9 @@
   },
   "lint-staged": {
     "*.css": "xyz",
-    "linters": {
-      "*.{js,jsx,mjs,ts,tsx}": ["eslint --fix --no-ignore", "git add"],
-      "*.md": ["remark --frail"],
-      "*.{css,html,js,json,jsx,md,mdx,mjs,scss,ts,tsx,yaml,yml}": ["prettier --write", "git add"]
-    },
-    "ignore": ["CHANGELOG.md"]
+    "*.{js,jsx,mjs,ts,tsx}": ["eslint --fix --no-ignore", "git add"],
+    "!(CHANGELOG).md": ["remark --frail"],
+    "*.{css,html,js,json,jsx,md,mdx,mjs,scss,ts,tsx,yaml,yml}": ["prettier --write", "git add"]
   },
   "standard-version": {
     "scripts": {