diff --git a/@typescript-eslint.js b/@typescript-eslint.js index 23747f0..0688682 100644 --- a/@typescript-eslint.js +++ b/@typescript-eslint.js @@ -4,6 +4,7 @@ module.exports = { rules: { "@typescript-eslint/quotes": 0, + "@typescript-eslint/brace-style": "off", "@typescript-eslint/func-call-spacing": "off", "@typescript-eslint/indent": "off", "@typescript-eslint/member-delimiter-style": "off", diff --git a/README.md b/README.md index f5b8722..c748fac 100644 --- a/README.md +++ b/README.md @@ -785,7 +785,7 @@ eslint-config-prettier has been tested with: - eslint-config-prettier 2.10.0 and older were tested with ESLint 4.x - eslint-config-prettier 2.1.1 and older were tested with ESLint 3.x - prettier 1.18.2 -- @typescript-eslint/eslint-plugin 2.1.0 +- @typescript-eslint/eslint-plugin 2.2.0 - eslint-plugin-babel 5.3.0 - eslint-plugin-flowtype 4.3.0 - eslint-plugin-react 7.14.3 diff --git a/package-lock.json b/package-lock.json index e0b0a1f..a213e0b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -720,51 +720,71 @@ "dev": true }, "@typescript-eslint/eslint-plugin": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.1.0.tgz", - "integrity": "sha512-3i/dLPwxaVfCsaLu3HkB8CAA1Uw3McAegrTs+VBJ0BrGRKW7nUwSqRfHfCS7sw7zSbf62q3v0v6pOS8MyaYItg==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.2.0.tgz", + "integrity": "sha512-rOodtI+IvaO8USa6ValYOrdWm9eQBgqwsY+B0PPiB+aSiK6p6Z4l9jLn/jI3z3WM4mkABAhKIqvGIBl0AFRaLQ==", "dev": true, "requires": { - "@typescript-eslint/experimental-utils": "2.1.0", - "eslint-utils": "^1.4.0", + "@typescript-eslint/experimental-utils": "2.2.0", + "eslint-utils": "^1.4.2", "functional-red-black-tree": "^1.0.1", "regexpp": "^2.0.1", - "tsutils": "^3.14.0" + "tsutils": "^3.17.1" } }, "@typescript-eslint/experimental-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.1.0.tgz", - "integrity": "sha512-ZJGLYXa4nxjNzomaEk1qts38B/vludg2LOM7dRc7SppEKsMPTS1swaTKS/pom+x4d/luJGoG00BDIss7PR1NQA==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.2.0.tgz", + "integrity": "sha512-IMhbewFs27Frd/ICHBRfIcsUCK213B8MsEUqvKFK14SDPjPR5JF6jgOGPlroybFTrGWpMvN5tMZdXAf+xcmxsA==", "dev": true, "requires": { "@types/json-schema": "^7.0.3", - "@typescript-eslint/typescript-estree": "2.1.0", - "eslint-scope": "^4.0.0" + "@typescript-eslint/typescript-estree": "2.2.0", + "eslint-scope": "^5.0.0" + }, + "dependencies": { + "eslint-scope": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz", + "integrity": "sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==", + "dev": true, + "requires": { + "esrecurse": "^4.1.0", + "estraverse": "^4.1.1" + } + } } }, "@typescript-eslint/parser": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.1.0.tgz", - "integrity": "sha512-0+hzirRJoqE1T4lSSvCfKD+kWjIpDWfbGBiisK5CENcr+22pPkHB2sfV1giON+UxHV4A08SSrQonZk7X2zIQdw==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.2.0.tgz", + "integrity": "sha512-0mf893kj9L65O5sA7wP6EoYvTybefuRFavUNhT7w9kjhkdZodoViwVS+k3D+ZxKhvtL7xGtP/y/cNMJX9S8W4A==", "dev": true, "requires": { "@types/eslint-visitor-keys": "^1.0.0", - "@typescript-eslint/experimental-utils": "2.1.0", - "@typescript-eslint/typescript-estree": "2.1.0", - "eslint-visitor-keys": "^1.0.0" + "@typescript-eslint/experimental-utils": "2.2.0", + "@typescript-eslint/typescript-estree": "2.2.0", + "eslint-visitor-keys": "^1.1.0" + }, + "dependencies": { + "eslint-visitor-keys": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz", + "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==", + "dev": true + } } }, "@typescript-eslint/typescript-estree": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.1.0.tgz", - "integrity": "sha512-482ErJJ7QYghBh+KA9G+Fwcuk/PLTy+9NBMz8S+6UFrUUnVvHRNAL7I70kdws2te0FBYEZW7pkDaXoT+y8UARw==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.2.0.tgz", + "integrity": "sha512-9/6x23A3HwWWRjEQbuR24on5XIfVmV96cDpGR9671eJv1ebFKHj2sGVVAwkAVXR2UNuhY1NeKS2QMv5P8kQb2Q==", "dev": true, "requires": { "glob": "^7.1.4", "is-glob": "^4.0.1", "lodash.unescape": "4.0.1", - "semver": "^6.2.0" + "semver": "^6.3.0" }, "dependencies": { "semver": { diff --git a/package.json b/package.json index 7a335be..288e446 100644 --- a/package.json +++ b/package.json @@ -38,8 +38,8 @@ "get-stdin": "^6.0.0" }, "devDependencies": { - "@typescript-eslint/eslint-plugin": "2.1.0", - "@typescript-eslint/parser": "2.1.0", + "@typescript-eslint/eslint-plugin": "2.2.0", + "@typescript-eslint/parser": "2.2.0", "babel-eslint": "10.0.3", "cross-spawn": "6.0.5", "doctoc": "1.4.0",