Skip to content

Commit 4e1c554

Browse files
QuramyQuramy
authored
Merge pull request #273 from Quramy/renovate/typescript-eslint-monorepo
chore(deps): update typescript-eslint monorepo to v4.29.1
2 parents 90d69a4 + 6714f09 commit 4e1c554

File tree

7 files changed

+144
-136
lines changed

7 files changed

+144
-136
lines changed

‎e2e/projects/simple/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"test": "echo \"Error: no test specified\" && exit 1"
66
},
77
"devDependencies": {
8-
"@typescript-eslint/parser": "4.26.1",
8+
"@typescript-eslint/parser": "4.29.1",
99
"eslint": "7.32.0",
1010
"typescript": "4.3.5"
1111
}

‎e2e/projects/simple/yarn.lock‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -78,48 +78,48 @@
7878
resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
7979
integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
8080

81-
"@typescript-eslint/parser@4.26.1":
82-
version "4.26.1"
83-
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.26.1.tgz#cecfdd5eb7a5c13aabce1c1cfd7fbafb5a0f1e8e"
84-
integrity sha512-q7F3zSo/nU6YJpPJvQveVlIIzx9/wu75lr6oDbDzoeIRWxpoc/HQ43G4rmMoCc5my/3uSj2VEpg/D83LYZF5HQ==
85-
dependencies:
86-
"@typescript-eslint/scope-manager" "4.26.1"
87-
"@typescript-eslint/types" "4.26.1"
88-
"@typescript-eslint/typescript-estree" "4.26.1"
81+
"@typescript-eslint/parser@4.29.1":
82+
version "4.29.1"
83+
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.29.1.tgz#17dfbb45c9032ffa0fe15881d20fbc2a4bdeb02d"
84+
integrity sha512-3fL5iN20hzX3Q4OkG7QEPFjZV2qsVGiDhEwwh+EkmE/w7oteiOvUNzmpu5eSwGJX/anCryONltJ3WDmAzAoCMg==
85+
dependencies:
86+
"@typescript-eslint/scope-manager" "4.29.1"
87+
"@typescript-eslint/types" "4.29.1"
88+
"@typescript-eslint/typescript-estree" "4.29.1"
8989
debug "^4.3.1"
9090

91-
"@typescript-eslint/scope-manager@4.26.1":
92-
version "4.26.1"
93-
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.26.1.tgz#075a74a15ff33ee3a7ed33e5fce16ee86689f662"
94-
integrity sha512-TW1X2p62FQ8Rlne+WEShyd7ac2LA6o27S9i131W4NwDSfyeVlQWhw8ylldNNS8JG6oJB9Ha9Xyc+IUcqipvheQ==
91+
"@typescript-eslint/scope-manager@4.29.1":
92+
version "4.29.1"
93+
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.29.1.tgz#f25da25bc6512812efa2ce5ebd36619d68e61358"
94+
integrity sha512-Hzv/uZOa9zrD/W5mftZa54Jd5Fed3tL6b4HeaOpwVSabJK8CJ+2MkDasnX/XK4rqP5ZTWngK1ZDeCi6EnxPQ7A==
9595
dependencies:
96-
"@typescript-eslint/types" "4.26.1"
97-
"@typescript-eslint/visitor-keys" "4.26.1"
96+
"@typescript-eslint/types" "4.29.1"
97+
"@typescript-eslint/visitor-keys" "4.29.1"
9898

99-
"@typescript-eslint/types@4.26.1":
100-
version "4.26.1"
101-
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.26.1.tgz#9e7c523f73c34b04a765e4167ca5650436ef1d38"
102-
integrity sha512-STyMPxR3cS+LaNvS8yK15rb8Y0iL0tFXq0uyl6gY45glyI7w0CsyqyEXl/Fa0JlQy+pVANeK3sbwPneCbWE7yg==
99+
"@typescript-eslint/types@4.29.1":
100+
version "4.29.1"
101+
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.29.1.tgz#94cce6cf7cc83451df03339cda99d326be2feaf5"
102+
integrity sha512-Jj2yu78IRfw4nlaLtKjVaGaxh/6FhofmQ/j8v3NXmAiKafbIqtAPnKYrf0sbGjKdj0hS316J8WhnGnErbJ4RCA==
103103

104-
"@typescript-eslint/typescript-estree@4.26.1":
105-
version "4.26.1"
106-
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.26.1.tgz#b2ce2e789233d62283fae2c16baabd4f1dbc9633"
107-
integrity sha512-l3ZXob+h0NQzz80lBGaykdScYaiEbFqznEs99uwzm8fPHhDjwaBFfQkjUC/slw6Sm7npFL8qrGEAMxcfBsBJUg==
104+
"@typescript-eslint/typescript-estree@4.29.1":
105+
version "4.29.1"
106+
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.1.tgz#7b32a25ff8e51f2671ccc6b26cdbee3b1e6c5e7f"
107+
integrity sha512-lIkkrR9E4lwZkzPiRDNq0xdC3f2iVCUjw/7WPJ4S2Sl6C3nRWkeE1YXCQ0+KsiaQRbpY16jNaokdWnm9aUIsfw==
108108
dependencies:
109-
"@typescript-eslint/types" "4.26.1"
110-
"@typescript-eslint/visitor-keys" "4.26.1"
109+
"@typescript-eslint/types" "4.29.1"
110+
"@typescript-eslint/visitor-keys" "4.29.1"
111111
debug "^4.3.1"
112112
globby "^11.0.3"
113113
is-glob "^4.0.1"
114114
semver "^7.3.5"
115115
tsutils "^3.21.0"
116116

117-
"@typescript-eslint/visitor-keys@4.26.1":
118-
version "4.26.1"
119-
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.26.1.tgz#0d55ea735cb0d8903b198017d6d4f518fdaac546"
120-
integrity sha512-IGouNSSd+6x/fHtYRyLOM6/C+QxMDzWlDtN41ea+flWuSF9g02iqcIlX8wM53JkfljoIjP0U+yp7SiTS1onEkw==
117+
"@typescript-eslint/visitor-keys@4.29.1":
118+
version "4.29.1"
119+
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.1.tgz#0615be8b55721f5e854f3ee99f1a714f2d093e5d"
120+
integrity sha512-zLqtjMoXvgdZY/PG6gqA73V8BjqPs4af1v2kiiETBObp+uC6gRYnJLmJHxC0QyUrrHDLJPIWNYxoBV3wbcRlag==
121121
dependencies:
122-
"@typescript-eslint/types" "4.26.1"
122+
"@typescript-eslint/types" "4.29.1"
123123
eslint-visitor-keys "^2.0.0"
124124

125125
acorn-jsx@^5.2.0, acorn-jsx@^5.3.1:

‎e2e/projects/ts-eslint-plugin/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"test": "echo \"Error: no test specified\" && exit 1"
66
},
77
"devDependencies": {
8-
"@typescript-eslint/eslint-plugin": "4.26.1",
9-
"@typescript-eslint/parser": "4.26.1",
8+
"@typescript-eslint/eslint-plugin": "4.29.1",
9+
"@typescript-eslint/parser": "4.29.1",
1010
"eslint": "7.32.0",
1111
"typescript": "4.3.5"
1212
}

‎e2e/projects/ts-eslint-plugin/yarn.lock‎

Lines changed: 41 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -83,74 +83,73 @@
8383
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad"
8484
integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==
8585

86-
"@typescript-eslint/eslint-plugin@4.26.1":
87-
version "4.26.1"
88-
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.26.1.tgz#b9c7313321cb837e2bf8bebe7acc2220659e67d3"
89-
integrity sha512-aoIusj/8CR+xDWmZxARivZjbMBQTT9dImUtdZ8tVCVRXgBUuuZyM5Of5A9D9arQPxbi/0rlJLcuArclz/rCMJw==
86+
"@typescript-eslint/eslint-plugin@4.29.1":
87+
version "4.29.1"
88+
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.1.tgz#808d206e2278e809292b5de752a91105da85860b"
89+
integrity sha512-AHqIU+SqZZgBEiWOrtN94ldR3ZUABV5dUG94j8Nms9rQnHFc8fvDOue/58K4CFz6r8OtDDc35Pw9NQPWo0Ayrw==
9090
dependencies:
91-
"@typescript-eslint/experimental-utils" "4.26.1"
92-
"@typescript-eslint/scope-manager" "4.26.1"
91+
"@typescript-eslint/experimental-utils" "4.29.1"
92+
"@typescript-eslint/scope-manager" "4.29.1"
9393
debug "^4.3.1"
9494
functional-red-black-tree "^1.0.1"
95-
lodash "^4.17.21"
9695
regexpp "^3.1.0"
9796
semver "^7.3.5"
9897
tsutils "^3.21.0"
9998

100-
"@typescript-eslint/experimental-utils@4.26.1":
101-
version "4.26.1"
102-
resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.26.1.tgz#a35980a2390da9232aa206b27f620eab66e94142"
103-
integrity sha512-sQHBugRhrXzRCs9PaGg6rowie4i8s/iD/DpTB+EXte8OMDfdCG5TvO73XlO9Wc/zi0uyN4qOmX9hIjQEyhnbmQ==
99+
"@typescript-eslint/experimental-utils@4.29.1":
100+
version "4.29.1"
101+
resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.1.tgz#0af2b17b0296b60c6b207f11062119fa9c5a8994"
102+
integrity sha512-kl6QG6qpzZthfd2bzPNSJB2YcZpNOrP6r9jueXupcZHnL74WiuSjaft7WSu17J9+ae9zTlk0KJMXPUj0daBxMw==
104103
dependencies:
105104
"@types/json-schema" "^7.0.7"
106-
"@typescript-eslint/scope-manager" "4.26.1"
107-
"@typescript-eslint/types" "4.26.1"
108-
"@typescript-eslint/typescript-estree" "4.26.1"
105+
"@typescript-eslint/scope-manager" "4.29.1"
106+
"@typescript-eslint/types" "4.29.1"
107+
"@typescript-eslint/typescript-estree" "4.29.1"
109108
eslint-scope "^5.1.1"
110109
eslint-utils "^3.0.0"
111110

112-
"@typescript-eslint/parser@4.26.1":
113-
version "4.26.1"
114-
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.26.1.tgz#cecfdd5eb7a5c13aabce1c1cfd7fbafb5a0f1e8e"
115-
integrity sha512-q7F3zSo/nU6YJpPJvQveVlIIzx9/wu75lr6oDbDzoeIRWxpoc/HQ43G4rmMoCc5my/3uSj2VEpg/D83LYZF5HQ==
111+
"@typescript-eslint/parser@4.29.1":
112+
version "4.29.1"
113+
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.29.1.tgz#17dfbb45c9032ffa0fe15881d20fbc2a4bdeb02d"
114+
integrity sha512-3fL5iN20hzX3Q4OkG7QEPFjZV2qsVGiDhEwwh+EkmE/w7oteiOvUNzmpu5eSwGJX/anCryONltJ3WDmAzAoCMg==
116115
dependencies:
117-
"@typescript-eslint/scope-manager" "4.26.1"
118-
"@typescript-eslint/types" "4.26.1"
119-
"@typescript-eslint/typescript-estree" "4.26.1"
116+
"@typescript-eslint/scope-manager" "4.29.1"
117+
"@typescript-eslint/types" "4.29.1"
118+
"@typescript-eslint/typescript-estree" "4.29.1"
120119
debug "^4.3.1"
121120

122-
"@typescript-eslint/scope-manager@4.26.1":
123-
version "4.26.1"
124-
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.26.1.tgz#075a74a15ff33ee3a7ed33e5fce16ee86689f662"
125-
integrity sha512-TW1X2p62FQ8Rlne+WEShyd7ac2LA6o27S9i131W4NwDSfyeVlQWhw8ylldNNS8JG6oJB9Ha9Xyc+IUcqipvheQ==
121+
"@typescript-eslint/scope-manager@4.29.1":
122+
version "4.29.1"
123+
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.29.1.tgz#f25da25bc6512812efa2ce5ebd36619d68e61358"
124+
integrity sha512-Hzv/uZOa9zrD/W5mftZa54Jd5Fed3tL6b4HeaOpwVSabJK8CJ+2MkDasnX/XK4rqP5ZTWngK1ZDeCi6EnxPQ7A==
126125
dependencies:
127-
"@typescript-eslint/types" "4.26.1"
128-
"@typescript-eslint/visitor-keys" "4.26.1"
126+
"@typescript-eslint/types" "4.29.1"
127+
"@typescript-eslint/visitor-keys" "4.29.1"
129128

130-
"@typescript-eslint/types@4.26.1":
131-
version "4.26.1"
132-
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.26.1.tgz#9e7c523f73c34b04a765e4167ca5650436ef1d38"
133-
integrity sha512-STyMPxR3cS+LaNvS8yK15rb8Y0iL0tFXq0uyl6gY45glyI7w0CsyqyEXl/Fa0JlQy+pVANeK3sbwPneCbWE7yg==
129+
"@typescript-eslint/types@4.29.1":
130+
version "4.29.1"
131+
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.29.1.tgz#94cce6cf7cc83451df03339cda99d326be2feaf5"
132+
integrity sha512-Jj2yu78IRfw4nlaLtKjVaGaxh/6FhofmQ/j8v3NXmAiKafbIqtAPnKYrf0sbGjKdj0hS316J8WhnGnErbJ4RCA==
134133

135-
"@typescript-eslint/typescript-estree@4.26.1":
136-
version "4.26.1"
137-
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.26.1.tgz#b2ce2e789233d62283fae2c16baabd4f1dbc9633"
138-
integrity sha512-l3ZXob+h0NQzz80lBGaykdScYaiEbFqznEs99uwzm8fPHhDjwaBFfQkjUC/slw6Sm7npFL8qrGEAMxcfBsBJUg==
134+
"@typescript-eslint/typescript-estree@4.29.1":
135+
version "4.29.1"
136+
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.1.tgz#7b32a25ff8e51f2671ccc6b26cdbee3b1e6c5e7f"
137+
integrity sha512-lIkkrR9E4lwZkzPiRDNq0xdC3f2iVCUjw/7WPJ4S2Sl6C3nRWkeE1YXCQ0+KsiaQRbpY16jNaokdWnm9aUIsfw==
139138
dependencies:
140-
"@typescript-eslint/types" "4.26.1"
141-
"@typescript-eslint/visitor-keys" "4.26.1"
139+
"@typescript-eslint/types" "4.29.1"
140+
"@typescript-eslint/visitor-keys" "4.29.1"
142141
debug "^4.3.1"
143142
globby "^11.0.3"
144143
is-glob "^4.0.1"
145144
semver "^7.3.5"
146145
tsutils "^3.21.0"
147146

148-
"@typescript-eslint/visitor-keys@4.26.1":
149-
version "4.26.1"
150-
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.26.1.tgz#0d55ea735cb0d8903b198017d6d4f518fdaac546"
151-
integrity sha512-IGouNSSd+6x/fHtYRyLOM6/C+QxMDzWlDtN41ea+flWuSF9g02iqcIlX8wM53JkfljoIjP0U+yp7SiTS1onEkw==
147+
"@typescript-eslint/visitor-keys@4.29.1":
148+
version "4.29.1"
149+
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.1.tgz#0615be8b55721f5e854f3ee99f1a714f2d093e5d"
150+
integrity sha512-zLqtjMoXvgdZY/PG6gqA73V8BjqPs4af1v2kiiETBObp+uC6gRYnJLmJHxC0QyUrrHDLJPIWNYxoBV3wbcRlag==
152151
dependencies:
153-
"@typescript-eslint/types" "4.26.1"
152+
"@typescript-eslint/types" "4.29.1"
154153
eslint-visitor-keys "^2.0.0"
155154

156155
acorn-jsx@^5.2.0:
@@ -762,11 +761,6 @@ lodash.truncate@^4.4.2:
762761
resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
763762
integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=
764763

765-
lodash@^4.17.21:
766-
version "4.17.21"
767-
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
768-
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
769-
770764
lru-cache@^6.0.0:
771765
version "6.0.0"
772766
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@
4343
"@types/is-glob": "4.0.2",
4444
"@types/jest": "27.0.0",
4545
"@types/node": "14.17.9",
46-
"@typescript-eslint/eslint-plugin": "4.26.1",
47-
"@typescript-eslint/parser": "4.26.1",
48-
"@typescript-eslint/typescript-estree": "4.26.1",
46+
"@typescript-eslint/eslint-plugin": "4.29.1",
47+
"@typescript-eslint/parser": "4.29.1",
48+
"@typescript-eslint/typescript-estree": "4.29.1",
4949
"eslint": "7.32.0",
5050
"eslint-config-prettier": "8.3.0",
5151
"fretted-strings": "1.0.1",

‎src/ast-converter.ts‎

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ function createExtra(code: string) {
4141
jsx: false,
4242
useJSXTextNode: false,
4343
log: () => {},
44+
programs: null,
4445
projects: [],
4546
errorOnUnknownASTType: false,
4647
errorOnTypeScriptSyntacticAndSemanticIssues: false,
@@ -51,6 +52,8 @@ function createExtra(code: string) {
5152
createDefaultProgram: false,
5253
filePath: "",
5354
EXPERIMENTAL_useSourceOfProjectReferenceRedirect: false,
55+
singleRun: false,
56+
moduleResolver: "",
5457
};
5558
return {
5659
...base,
@@ -167,17 +170,25 @@ function applyParserOptionsToExtra(extra: Extra, options: TSESTreeOptions) {
167170
// NOTE - ensureAbsolutePath relies upon having the correct tsconfigRootDir in extra
168171
extra.filePath = ensureAbsolutePath(extra.filePath, extra);
169172

170-
const projectFolderIgnoreList = (options.projectFolderIgnoreList ?? ["**/node_modules/**"])
171-
.reduce<string[]>((acc, folder) => {
172-
if (typeof folder === "string") {
173-
acc.push(folder);
174-
}
175-
return acc;
176-
}, [])
177-
// prefix with a ! for not match glob
178-
.map(folder => (folder.startsWith("!") ? folder : `!${folder}`));
179-
// NOTE - prepareAndTransformProjects relies upon having the correct tsconfigRootDir in extra
180-
extra.projects = prepareAndTransformProjects(extra, options.project, projectFolderIgnoreList);
173+
if (Array.isArray(options.programs)) {
174+
if (options.programs.length) {
175+
extra.programs = options.programs;
176+
}
177+
}
178+
179+
if (!extra.programs) {
180+
const projectFolderIgnoreList = (options.projectFolderIgnoreList ?? ["**/node_modules/**"])
181+
.reduce<string[]>((acc, folder) => {
182+
if (typeof folder === "string") {
183+
acc.push(folder);
184+
}
185+
return acc;
186+
}, [])
187+
// prefix with a ! for not match glob
188+
.map(folder => (folder.startsWith("!") ? folder : `!${folder}`));
189+
// NOTE - prepareAndTransformProjects relies upon having the correct tsconfigRootDir in extra
190+
extra.projects = prepareAndTransformProjects(extra, options.project, projectFolderIgnoreList);
191+
}
181192

182193
if (Array.isArray(options.extraFileExtensions) && options.extraFileExtensions.every(ext => typeof ext === "string")) {
183194
extra.extraFileExtensions = options.extraFileExtensions;
@@ -201,6 +212,10 @@ function applyParserOptionsToExtra(extra: Extra, options: TSESTreeOptions) {
201212
typeof options.EXPERIMENTAL_useSourceOfProjectReferenceRedirect === "boolean" &&
202213
options.EXPERIMENTAL_useSourceOfProjectReferenceRedirect;
203214

215+
if (typeof options.moduleResolver === "string") {
216+
extra.moduleResolver = options.moduleResolver;
217+
}
218+
204219
return extra;
205220
}
206221

0 commit comments

Comments
 (0)