Merge pull request #5 from weirdpattern/breaking--upgrade-dependencies

chore!: upgrade dependencies

Author: weirdpattern

CHANGELOG.md

@@ -1,3 +1,12 @@
+# v3.0.0
+[link](https://github.com/weirdpattern/eslint-config-typescript/compare/v2.0.0...v3.0.0)
+
+This release contains **breaking changes**
+
+* Update dependencies
+* Introduce `overrides` in configurations that are exclusive to `typescript`
+  * This requires an upgrade to eslint 6.0.0 to support `extends` in `overrides` 
+
 # v2.0.0
 [link](https://github.com/weirdpattern/eslint-config-typescript/compare/v1.1.0...v2.0.0)
 

package.json

@@ -1,6 +1,6 @@
 {
   "license": "MIT",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "name": "eslint-config-typescript",
   "description": "A base set of recommended ESLint rules for TypeScript projects",
   "author": "Patricio Trevino <patricio@weirdpattern.com>",
@@ -25,28 +25,29 @@
     "react.js"
   ],
   "devDependencies": {
-    "@types/node": "^10.12.21",
-    "@typescript-eslint/eslint-plugin": "^1.2.0",
-    "@typescript-eslint/parser": "^1.2.0",
+    "@types/node": "^12.0.12",
+    "@typescript-eslint/eslint-plugin": "^1.11.0",
+    "@typescript-eslint/parser": "^1.11.0",
     "create-react-class": "^15.6.3",
     "cross-spawn": "^6.0.5",
-    "eslint": "^5.13.0",
-    "eslint-config-prettier": "^4.0.0",
+    "eslint": "^6.0.1",
+    "eslint-config-prettier": "^6.0.0",
     "eslint-plugin-filenames": "^1.3.2",
-    "eslint-plugin-jsdoc": "^4.1.0",
-    "eslint-plugin-prettier": "^3.0.1",
-    "eslint-plugin-react": "^7.12.4",
-    "husky": "^1.3.1",
-    "jest": "^24.0.0",
-    "lint-staged": "^8.1.2",
-    "prettier": "^1.16.3",
-    "typescript": "^3.2.1"
+    "eslint-plugin-jsdoc": "^10.3.0",
+    "eslint-plugin-prettier": "^3.1.0",
+    "eslint-plugin-react": "^7.14.2",
+    "escape-regex-string": "^1.0.6",
+    "husky": "^3.0.0",
+    "jest": "^24.8.0",
+    "lint-staged": "^9.0.2",
+    "prettier": "^1.18.2",
+    "typescript": "^3.5.2"
   },
   "peerDependencies": {
-    "@typescript-eslint/eslint-plugin": ">=1.0.0",
-    "@typescript-eslint/parser": ">=1.0.0",
-    "eslint": ">=5.0.0",
-    "typescript": ">=3.2.1"
+    "@typescript-eslint/eslint-plugin": ">=1.8.0",
+    "@typescript-eslint/parser": ">=1.8.0",
+    "eslint": ">=6.0.0",
+    "typescript": "*"
   },
   "scripts": {
     "lint": "eslint .",

specs/config.prettier-react.specs.js

@@ -68,8 +68,24 @@ describe("config", () => {
     const config = require("../prettier-react");
 
     expect(config).toBeDefined();
-    expect(config.extends).toContain("plugin:prettier/recommended");
-    expect(config.extends).toContain("prettier/@typescript-eslint");
-    expect(config.extends).toContain("prettier/react");
+    expect(config).toMatchInlineSnapshot(`
+      Object {
+        "extends": Array [
+          "plugin:prettier/recommended",
+          "prettier/react",
+        ],
+        "overrides": Array [
+          Object {
+            "extends": Array [
+              "prettier/@typescript-eslint",
+            ],
+            "files": Array [
+              "*.ts",
+              "*.tsx",
+            ],
+          },
+        ],
+      }
+    `);
   });
 });

specs/config.prettier.specs.js

@@ -69,7 +69,23 @@ describe("config", () => {
     const config = require("../prettier");
 
     expect(config).toBeDefined();
-    expect(config.extends).toContain("plugin:prettier/recommended");
-    expect(config.extends).toContain("prettier/@typescript-eslint");
+    expect(config).toMatchInlineSnapshot(`
+      Object {
+        "extends": Array [
+          "plugin:prettier/recommended",
+        ],
+        "overrides": Array [
+          Object {
+            "extends": Array [
+              "prettier/@typescript-eslint",
+            ],
+            "files": Array [
+              "*.ts",
+              "*.tsx",
+            ],
+          },
+        ],
+      }
+    `);
   });
 });

specs/config.react.specs.js

@@ -68,6 +68,12 @@ describe("config", () => {
     const config = require("../react");
 
     expect(config).toBeDefined();
-    expect(config.extends).toContain("plugin:react/recommended");
+    expect(config).toMatchInlineSnapshot(`
+      Object {
+        "extends": Array [
+          "plugin:react/recommended",
+        ],
+      }
+    `);
   });
 });

specs/config.specs.js

@@ -71,7 +71,22 @@ describe("config", () => {
     const config = require("../index");
 
     expect(config).toBeDefined();
-    expect(config.extends).toContain("eslint:recommended");
-    expect(config.extends).toContain("plugin:@typescript-eslint/recommended");
+    expect(config).toMatchInlineSnapshot(`
+      Object {
+        "overrides": Array [
+          Object {
+            "extends": Array [
+              "eslint:recommended",
+              "plugin:@typescript-eslint/eslint-recommended",
+              "plugin:@typescript-eslint/recommended",
+            ],
+            "files": Array [
+              "*.ts",
+              "*.tsx",
+            ],
+          },
+        ],
+      }
+    `);
   });
 });

src/prettier.js

@@ -9,5 +9,11 @@
 "use strict";
 
 module.exports = {
-  extends: ["plugin:prettier/recommended", "prettier/@typescript-eslint"]
+  extends: ["plugin:prettier/recommended"],
+  overrides: [
+    {
+      files: ["*.ts", "*.tsx"],
+      extends: ["prettier/@typescript-eslint"]
+    }
+  ]
 };

src/typescript.js

@@ -9,5 +9,14 @@
 "use strict";
 
 module.exports = {
-  extends: ["eslint:recommended", "plugin:@typescript-eslint/recommended"]
+  overrides: [
+    {
+      files: ["*.ts", "*.tsx"],
+      extends: [
+        "eslint:recommended",
+        "plugin:@typescript-eslint/eslint-recommended",
+        "plugin:@typescript-eslint/recommended"
+      ]
+    }
+  ]
 };