Skip to content

Commit 45f4131

Browse files
authored
chore: upgrade (typescript-)eslint, adjust VSCode settings (#4075)
1 parent 8f7ae5f commit 45f4131

File tree

9 files changed

+70
-50
lines changed

9 files changed

+70
-50
lines changed

.eslintignore

Lines changed: 0 additions & 7 deletions
This file was deleted.

.eslintrc.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,14 @@
22
"root": true,
33
"extends": [
44
"./packages/eslint-config"
5+
],
6+
"ignorePatterns": [
7+
"node_modules",
8+
"dist",
9+
"lib",
10+
"fixtures",
11+
"coverage",
12+
"__snapshots__",
13+
"src/generated"
514
]
615
}

.vscode/extensions.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
"giladgray.theme-blueprint",
77
// for consistent editor settings:
88
"EditorConfig.EditorConfig",
9-
// for typescript source files:
10-
"eg2.tslint",
11-
// for sass source files:
12-
"shinnn.stylelint",
9+
// for TS and JS:
10+
"dbaeumer.vscode-eslint"
1311
]
1412
}

.vscode/settings.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,15 @@
1313
"**/lib": true,
1414
"**/node_modules": true,
1515
"docs": true,
16-
"site/docs": true
16+
"site/docs": true,
17+
"packages/docs-data/src/generated": true
1718
},
1819
"editor.insertSpaces": true,
1920
"editor.tabSize": 4,
2021
"[scss]": {
2122
"editor.tabSize": 2
22-
}
23+
},
24+
"eslint.workingDirectories": [
25+
{ "pattern": "./packages/*" }
26+
]
2327
}

packages/core/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
"lib/cjs/common/configureDom4.js"
1919
],
2020
"bin": {
21-
"upgrade-blueprint-2.0.0-rename": "./scripts/upgrade-blueprint-2.0.0-rename.sh",
22-
"upgrade-blueprint-3.0.0-rename": "./scripts/upgrade-blueprint-3.0.0-rename.sh"
21+
"upgrade-blueprint-2.0.0-rename": "scripts/upgrade-blueprint-2.0.0-rename.sh",
22+
"upgrade-blueprint-3.0.0-rename": "scripts/upgrade-blueprint-3.0.0-rename.sh"
2323
},
2424
"scripts": {
2525
"clean": "rm -rf dist/* && rm -rf lib/*",

packages/eslint-config/README.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,12 @@ Enable this configuration in your ESLint configuration file (e.g. `.eslintrc.jso
2323
]
2424
}
2525
```
26+
27+
### VSCode
28+
29+
If you use VSCode, install the [dbaeumer.vscode-eslint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint) plugin to lint your code in the editor. We recommend enabling these global VSCode settings:
30+
31+
```json
32+
"editor.formatOnSave": true,
33+
"eslint.format.enable": true
34+
```

packages/eslint-config/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
"dependencies": {
66
"@blueprintjs/eslint-plugin-blueprint": "^0.1.0",
77
"@blueprintjs/tslint-config": "^2.0.0",
8-
"@typescript-eslint/eslint-plugin": "^2.15.0",
9-
"@typescript-eslint/eslint-plugin-tslint": "^2.15.0",
10-
"@typescript-eslint/parser": "^2.15.0",
11-
"eslint": "^6.7.2"
8+
"@typescript-eslint/eslint-plugin": "^2.29.0",
9+
"@typescript-eslint/eslint-plugin-tslint": "^2.29.0",
10+
"@typescript-eslint/parser": "^2.29.0",
11+
"eslint": "^6.8.0"
1212
},
1313
"repository": {
1414
"type": "git",

packages/eslint-plugin-blueprint/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
"test:jest-ci": "jest --ci --runInBand"
1010
},
1111
"dependencies": {
12-
"@typescript-eslint/eslint-plugin": "^2.11.0",
13-
"@typescript-eslint/eslint-plugin-tslint": "^2.10.0",
14-
"@typescript-eslint/parser": "^2.10.0",
15-
"eslint": "^6.7.2",
12+
"@typescript-eslint/eslint-plugin": "^2.29.0",
13+
"@typescript-eslint/eslint-plugin-tslint": "^2.29.0",
14+
"@typescript-eslint/parser": "^2.29.0",
15+
"eslint": "^6.8.0",
1616
"jest": "^24.9.0",
1717
"ts-jest": "^24.2.0"
1818
},

yarn.lock

Lines changed: 34 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -635,48 +635,48 @@
635635
dependencies:
636636
"@types/yargs-parser" "*"
637637

638-
"@typescript-eslint/eslint-plugin-tslint@^2.10.0", "@typescript-eslint/eslint-plugin-tslint@^2.15.0":
639-
version "2.16.0"
640-
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin-tslint/-/eslint-plugin-tslint-2.16.0.tgz#8e8573cc2560ddae5a8a30fc2eb6af10f1ff9658"
641-
integrity sha512-F+In2z6VCWiI0J4P4OzUQY9UzT5y/0Xg6bHM6twoK5XmPdbR7zT9JzIZKLcXyr80XT5LbgHjnW6oPGp1O3W36g==
638+
"@typescript-eslint/eslint-plugin-tslint@^2.29.0":
639+
version "2.29.0"
640+
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin-tslint/-/eslint-plugin-tslint-2.29.0.tgz#1586c6f88043164b64a017e9952518c1b985299d"
641+
integrity sha512-r8mZE1dfDLj7B65TLvAk9SvGCdoyD/ZbuqTDhKf2+MkdMC6R99+uznz2JJ8WG+T7E2i8i5OWDFQQEcWoNDKQvQ==
642642
dependencies:
643-
"@typescript-eslint/experimental-utils" "2.16.0"
643+
"@typescript-eslint/experimental-utils" "2.29.0"
644644
lodash "^4.17.15"
645645

646-
"@typescript-eslint/eslint-plugin@^2.11.0", "@typescript-eslint/eslint-plugin@^2.15.0":
647-
version "2.16.0"
648-
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.16.0.tgz#bf339b7db824c7cc3fd1ebedbc88dd17016471af"
649-
integrity sha512-TKWbeFAKRPrvKiR9GNxErQ8sELKqg1ZvXi6uho07mcKShBnCnqNpDQWP01FEvWKf0bxM2g7uQEI5MNjSNqvUpQ==
646+
"@typescript-eslint/eslint-plugin@^2.29.0":
647+
version "2.29.0"
648+
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.29.0.tgz#c9efab7624e3dd6d144a0e4577a541d1bd42c2ac"
649+
integrity sha512-X/YAY7azKirENm4QRpT7OVmzok02cSkqeIcLmdz6gXUQG4Hk0Fi9oBAynSAyNXeGdMRuZvjBa0c1Lu0dn/u6VA==
650650
dependencies:
651-
"@typescript-eslint/experimental-utils" "2.16.0"
652-
eslint-utils "^1.4.3"
651+
"@typescript-eslint/experimental-utils" "2.29.0"
653652
functional-red-black-tree "^1.0.1"
654653
regexpp "^3.0.0"
655654
tsutils "^3.17.1"
656655

657-
"@typescript-eslint/experimental-utils@2.16.0":
658-
version "2.16.0"
659-
resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.16.0.tgz#bba65685728c532e0ddc811a0376e8d38e671f77"
660-
integrity sha512-bXTmAztXpqxliDKZgvWkl+5dHeRN+jqXVZ16peKKFzSXVzT6mz8kgBpHiVzEKO2NZ8OCU7dG61K9sRS/SkUUFQ==
656+
"@typescript-eslint/experimental-utils@2.29.0":
657+
version "2.29.0"
658+
resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.29.0.tgz#3cb8060de9265ba131625a96bbfec31ba6d4a0fe"
659+
integrity sha512-H/6VJr6eWYstyqjWXBP2Nn1hQJyvJoFdDtsHxGiD+lEP7piGnGpb/ZQd+z1ZSB1F7dN+WsxUDh8+S4LwI+f3jw==
661660
dependencies:
662661
"@types/json-schema" "^7.0.3"
663-
"@typescript-eslint/typescript-estree" "2.16.0"
662+
"@typescript-eslint/typescript-estree" "2.29.0"
664663
eslint-scope "^5.0.0"
664+
eslint-utils "^2.0.0"
665665

666-
"@typescript-eslint/parser@^2.10.0", "@typescript-eslint/parser@^2.15.0":
667-
version "2.16.0"
668-
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.16.0.tgz#d0c0135a8fdb915f670802ddd7c1ba457c1b4f9d"
669-
integrity sha512-+w8dMaYETM9v6il1yYYkApMSiwgnqXWJbXrA94LAWN603vXHACsZTirJduyeBOJjA9wT6xuXe5zZ1iCUzoxCfw==
666+
"@typescript-eslint/parser@^2.29.0":
667+
version "2.29.0"
668+
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.29.0.tgz#6e3c4e21ed6393dc05b9d8b47f0b7e731ef21c9c"
669+
integrity sha512-H78M+jcu5Tf6m/5N8iiFblUUv+HJDguMSdFfzwa6vSg9lKR8Mk9BsgeSjO8l2EshKnJKcbv0e8IDDOvSNjl0EA==
670670
dependencies:
671671
"@types/eslint-visitor-keys" "^1.0.0"
672-
"@typescript-eslint/experimental-utils" "2.16.0"
673-
"@typescript-eslint/typescript-estree" "2.16.0"
672+
"@typescript-eslint/experimental-utils" "2.29.0"
673+
"@typescript-eslint/typescript-estree" "2.29.0"
674674
eslint-visitor-keys "^1.1.0"
675675

676-
"@typescript-eslint/typescript-estree@2.16.0":
677-
version "2.16.0"
678-
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.16.0.tgz#b444943a76c716ed32abd08cbe96172d2ca0ab75"
679-
integrity sha512-hyrCYjFHISos68Bk5KjUAXw0pP/455qq9nxqB1KkT67Pxjcfw+r6Yhcmqnp8etFL45UexCHUMrADHH7dI/m2WQ==
676+
"@typescript-eslint/typescript-estree@2.29.0":
677+
version "2.29.0"
678+
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.29.0.tgz#1be6612bb02fc37ac9f466521c1459a4744e8d3a"
679+
integrity sha512-3YGbtnWy4az16Egy5Fj5CckkVlpIh0MADtAQza+jiMADRSKkjdpzZp/5WuvwK/Qib3Z0HtzrDFeWanS99dNhnA==
680680
dependencies:
681681
debug "^4.1.1"
682682
eslint-visitor-keys "^1.1.0"
@@ -3973,12 +3973,19 @@ eslint-utils@^1.4.3:
39733973
dependencies:
39743974
eslint-visitor-keys "^1.1.0"
39753975

3976+
eslint-utils@^2.0.0:
3977+
version "2.0.0"
3978+
resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.0.0.tgz#7be1cc70f27a72a76cd14aa698bcabed6890e1cd"
3979+
integrity sha512-0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA==
3980+
dependencies:
3981+
eslint-visitor-keys "^1.1.0"
3982+
39763983
eslint-visitor-keys@^1.1.0:
39773984
version "1.1.0"
39783985
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
39793986
integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
39803987

3981-
eslint@^6.7.2:
3988+
eslint@^6.7.2, eslint@^6.8.0:
39823989
version "6.8.0"
39833990
resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb"
39843991
integrity sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==

0 commit comments

Comments
 (0)