Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit cfbfcdc

Browse files
JamesHenryJamesHenry
committed
Merge master and fix conflicts
2 parents c8665f6 + 3e26ab6 commit cfbfcdc

File tree

339 files changed

+189642
-335324
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

339 files changed

+189642
-335324
lines changed

‎.all-contributorsrc

Lines changed: 161 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,161 @@
1+
{
2+
"projectName": "typescript-eslint",
3+
"projectOwner": "typescript-eslint",
4+
"repoType": "github",
5+
"repoHost": "https://github.com",
6+
"files": [
7+
"CONTRIBUTORS.md"
8+
],
9+
"imageSize": 100,
10+
"commit": false,
11+
"contributors": [
12+
{
13+
"login": "JamesHenry",
14+
"name": "James Henry",
15+
"avatar_url": "https://avatars1.githubusercontent.com/u/900523?v=4",
16+
"profile": "https://github.com/JamesHenry",
17+
"contributions": []
18+
},
19+
{
20+
"login": "armano2",
21+
"name": "Armano",
22+
"avatar_url": "https://avatars1.githubusercontent.com/u/625469?v=4",
23+
"profile": "https://github.com/armano2",
24+
"contributions": []
25+
},
26+
{
27+
"login": "soda0289",
28+
"name": "Reyad Attiyat",
29+
"avatar_url": "https://avatars1.githubusercontent.com/u/2373964?v=4",
30+
"profile": "https://github.com/soda0289",
31+
"contributions": []
32+
},
33+
{
34+
"login": "bradzacher",
35+
"name": "Brad Zacher",
36+
"avatar_url": "https://avatars1.githubusercontent.com/u/7462525?v=4",
37+
"profile": "https://github.com/bradzacher",
38+
"contributions": []
39+
},
40+
{
41+
"login": "weirdpattern",
42+
"name": "Patricio Trevino",
43+
"avatar_url": "https://avatars0.githubusercontent.com/u/19519411?v=4",
44+
"profile": "https://github.com/weirdpattern",
45+
"contributions": []
46+
},
47+
{
48+
"login": "nzakas",
49+
"name": "Nicholas C. Zakas",
50+
"avatar_url": "https://avatars3.githubusercontent.com/u/38546?v=4",
51+
"profile": "https://github.com/nzakas",
52+
"contributions": []
53+
},
54+
{
55+
"login": "j-f1",
56+
"name": "Jed Fox",
57+
"avatar_url": "https://avatars2.githubusercontent.com/u/25517624?v=4",
58+
"profile": "https://github.com/j-f1",
59+
"contributions": []
60+
},
61+
{
62+
"login": "uniqueiniquity",
63+
"name": "Benjamin Lichtman",
64+
"avatar_url": "https://avatars1.githubusercontent.com/u/9092011?v=4",
65+
"profile": "https://github.com/uniqueiniquity",
66+
"contributions": []
67+
},
68+
{
69+
"login": "kaicataldo",
70+
"name": "Kai Cataldo",
71+
"avatar_url": "https://avatars2.githubusercontent.com/u/7041728?v=4",
72+
"profile": "https://github.com/kaicataldo",
73+
"contributions": []
74+
},
75+
{
76+
"login": "Pajn",
77+
"name": "Rasmus Eneman",
78+
"avatar_url": "https://avatars1.githubusercontent.com/u/817422?v=4",
79+
"profile": "https://github.com/Pajn",
80+
"contributions": []
81+
},
82+
{
83+
"login": "azz",
84+
"name": "Lucas Azzola",
85+
"avatar_url": "https://avatars3.githubusercontent.com/u/1297597?v=4",
86+
"profile": "https://github.com/azz",
87+
"contributions": []
88+
},
89+
{
90+
"login": "dannyfritz",
91+
"name": "Danny Fritz",
92+
"avatar_url": "https://avatars1.githubusercontent.com/u/315788?v=4",
93+
"profile": "https://github.com/dannyfritz",
94+
"contributions": []
95+
},
96+
{
97+
"login": "ikatyang",
98+
"name": "Ika",
99+
"avatar_url": "https://avatars1.githubusercontent.com/u/8341033?v=4",
100+
"profile": "https://github.com/ikatyang",
101+
"contributions": []
102+
},
103+
{
104+
"login": "mysticatea",
105+
"name": "Toru Nagashima",
106+
"avatar_url": "https://avatars2.githubusercontent.com/u/1937871?v=4",
107+
"profile": "https://github.com/mysticatea",
108+
"contributions": []
109+
},
110+
{
111+
"login": "macklinu",
112+
"name": "mackie",
113+
"avatar_url": "https://avatars1.githubusercontent.com/u/2344137?v=4",
114+
"profile": "https://github.com/macklinu",
115+
"contributions": []
116+
},
117+
{
118+
"login": "lukyth",
119+
"name": "Kanitkorn Sujautra",
120+
"avatar_url": "https://avatars3.githubusercontent.com/u/7040242?v=4",
121+
"profile": "https://github.com/lukyth",
122+
"contributions": []
123+
},
124+
{
125+
"login": "platinumazure",
126+
"name": "Kevin Partington",
127+
"avatar_url": "https://avatars0.githubusercontent.com/u/284282?v=4",
128+
"profile": "https://github.com/platinumazure",
129+
"contributions": []
130+
},
131+
{
132+
"login": "mightyiam",
133+
"name": "Shahar Or",
134+
"avatar_url": "https://avatars2.githubusercontent.com/u/635591?v=4",
135+
"profile": "https://github.com/mightyiam",
136+
"contributions": []
137+
},
138+
{
139+
"login": "invalid-email-address",
140+
"name": "Check your git settings!",
141+
"avatar_url": "https://avatars0.githubusercontent.com/u/148100?v=4",
142+
"profile": "https://github.com/invalid-email-address",
143+
"contributions": []
144+
},
145+
{
146+
"login": "flying-sheep",
147+
"name": "Philipp A.",
148+
"avatar_url": "https://avatars0.githubusercontent.com/u/291575?v=4",
149+
"profile": "https://github.com/flying-sheep",
150+
"contributions": []
151+
},
152+
{
153+
"login": "g-plane",
154+
"name": "Pig Fang",
155+
"avatar_url": "https://avatars1.githubusercontent.com/u/17216317?v=4",
156+
"profile": "https://github.com/g-plane",
157+
"contributions": []
158+
}
159+
],
160+
"contributorsPerLine": 7
161+
}

‎.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ node_modules
22
dist
33
jest.config.js
44
fixtures
5+
shared-fixtures
56
coverage
67

78
packages/typescript-estree/src/estree

‎.eslintrc.json

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
},
88
"extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
99
"rules": {
10+
"comma-dangle": ["error", "always-multiline"],
1011
"no-mixed-operators": "error",
1112
"no-console": "off",
1213
"no-undef": "off",
@@ -24,44 +25,42 @@
2425
"sourceType": "module",
2526
"ecmaFeatures": {
2627
"jsx": false
27-
}
28+
},
29+
"project": "./tsconfig.base.json"
2830
},
2931
"overrides": [
3032
{
3133
"files": [
32-
"packages/eslint-plugin-tslint/**/*.ts",
33-
"packages/eslint-plugin/**/*.js",
34-
"packages/parser/**/*.ts",
35-
"packages/typescript-estree/**/*.ts"
34+
"packages/eslint-plugin-tslint/tests/**/*.ts",
35+
"packages/eslint-plugin/tests/**/*.test.ts",
36+
"packages/parser/tests/**/*.ts",
37+
"packages/typescript-estree/tests/**/*.ts"
3638
],
3739
"env": {
3840
"jest/globals": true
3941
},
4042
"rules": {
4143
"jest/no-disabled-tests": "warn",
4244
"jest/no-focused-tests": "error",
45+
"jest/no-alias-methods": "error",
4346
"jest/no-identical-title": "error",
47+
"jest/no-jasmine-globals": "error",
48+
"jest/no-jest-import": "error",
49+
"jest/no-test-prefixes": "error",
50+
"jest/no-test-callback": "error",
51+
"jest/no-test-return-statement": "error",
4452
"jest/prefer-to-have-length": "warn",
53+
"jest/prefer-spy-on": "error",
4554
"jest/valid-expect": "error"
4655
}
4756
},
4857
{
49-
"files": ["packages/eslint-plugin/**/*.js"],
58+
"files": [
59+
"packages/eslint-plugin/test/**/*.ts",
60+
"packages/eslint-plugin-tslint/tests/**/*.spec.ts"
61+
],
5062
"rules": {
51-
"eslint-plugin/fixer-return": "error",
52-
"eslint-plugin/no-identical-tests": "error",
53-
"eslint-plugin/no-missing-placeholders": "error",
54-
"eslint-plugin/no-unused-placeholders": "error",
55-
"eslint-plugin/no-useless-token-range": "error",
56-
"eslint-plugin/require-meta-fixable": "error",
57-
"eslint-plugin/prefer-placeholders": "error",
58-
"eslint-plugin/prefer-replace-text": "error",
59-
"eslint-plugin/no-deprecated-report-api": "error",
60-
"eslint-plugin/report-message-format": ["error", "^[A-Z'{].*[\\.}]$"],
61-
"eslint-plugin/no-deprecated-context-methods": "error",
62-
"eslint-plugin/prefer-output-null": "error",
63-
"eslint-plugin/test-case-shorthand-strings": "error",
64-
"eslint-plugin/require-meta-type": "error"
63+
"eslint-plugin/no-identical-tests": "error"
6564
}
6665
}
6766
]

‎.github/PULL_REQUEST_TEMPLATE/standard.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
name: 'Standard'
3+
about: Standard Pull Request Template
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
---
8+
9+
<!-- Please add as much info as you can! -->

‎.github/PULL_REQUEST_TEMPLATE/typescript_version_upgrade.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
name: 'TypeScript Version Upgrade'
3+
about: Used when upgrading the supported version of TypeScript
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
---
8+
9+
**Please complete the following:**
10+
11+
TypeScript version added by this PR: `{{ INSERT_TYPESCRIPT_VERSION }}`
12+
13+
- [ ] I have updated the devDependency range in the root package.json
14+
- [ ] I have updated the range value in `packages/typescript-estree/src/parser.ts`
15+
- [ ] I have run the existing tests to make sure they still pass, or made any required updates
16+
- [ ] I have added new tests for the features introduced in this newer version of TypeScript
17+
- New feature tests added:
18+
- ...

‎.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@ build/Release
3737
node_modules/
3838
jspm_packages/
3939

40-
# TypeScript v1 declaration files
41-
typings/
42-
4340
# Optional npm cache directory
4441
.npm
4542

‎.prettierrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"trailingComma": "all"
3+
}

‎.vscode/launch.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@
1111
"cwd": "${workspaceFolder}/packages/eslint-plugin/",
1212
"program": "${workspaceFolder}/node_modules/jest/bin/jest.js",
1313
"args": [
14-
"--colors",
15-
"${workspaceFolder}/packages/eslint-plugin/tests/lib/rules/${fileBasename}"
14+
"--runInBand",
15+
"tests/rules/${fileBasenameNoExtension}"
1616
],
17+
"sourceMaps": true,
1718
"console": "integratedTerminal",
1819
"internalConsoleOptions": "neverOpen"
1920
}

0 commit comments

Comments
 (0)