Skip to content

Commit 7862dc0

Browse files
committed
Merge branch 'main' into alexr00/shaggy-dolphin
2 parents 645d843 + 84b0372 commit 7862dc0

File tree

122 files changed

+1984
-1299
lines changed

Some content is hidden

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

122 files changed

+1984
-1299
lines changed

.eslintignore

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

.eslintrc.base.json

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

.eslintrc.browser.json

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

.eslintrc.js

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

.eslintrc.node.json

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

.eslintrc.webviews.json

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

azure-pipeline.nightly.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ extends:
3131

3232
l10nSourcePaths: ./src
3333

34+
nodeVersion: "20.x"
35+
3436
buildSteps:
3537
- script: yarn install --frozen-lockfile --check-files
3638
displayName: Install dependencies

azure-pipeline.release.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ extends:
2828

2929
l10nSourcePaths: ./src
3030

31+
nodeVersion: "20.x"
32+
3133
buildSteps:
3234
- script: yarn install --frozen-lockfile --check-files
3335
displayName: Install dependencies

build/eslint-rules/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
'use strict';
77

8-
module.exports = {
8+
exports.rules = {
99
'public-methods-well-defined-types': require('./public-methods-well-defined-types'),
1010
'no-any-except-union-method-signature': require('./no-any-except-union-method-signature'),
1111
'no-pr-in-user-strings': require('./no-pr-in-user-strings'),

build/eslint-rules/public-methods-well-defined-types.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,11 @@ module.exports = {
5959

6060
// Type references with inline type arguments: Promise<{x: string}>, Array<{y: number}>
6161
case 'TSTypeReference':
62-
// Check if any type arguments contain inline types
63-
if (typeNode.typeParameters && typeNode.typeParameters.params) {
64-
return typeNode.typeParameters.params.some(isInlineType);
62+
// ESLint 9 / @typescript-eslint v8 may expose generic instantiations on `typeArguments` instead of `typeParameters`.
63+
// Support both shapes defensively.
64+
const typeArgs = typeNode.typeParameters || typeNode.typeArguments;
65+
if (typeArgs && typeArgs.params) {
66+
return typeArgs.params.some(isInlineType);
6567
}
6668
return false;
6769

0 commit comments

Comments
 (0)