Skip to content

Commit 8cde2d0

Browse files
authored
feat: support TypeScript 6 (#12124)
1 parent 1bf86c9 commit 8cde2d0

67 files changed

Lines changed: 1522 additions & 464 deletions

File tree

Some content is hidden

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

packages/ast-spec/src/jsx/JSXAttribute/fixtures/element-non-self-closing/snapshots/2-TSESTree-Tokens.shot

Lines changed: 12 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/ast-spec/src/jsx/JSXNamespacedName/fixtures/component/snapshots/2-TSESTree-Tokens.shot

Lines changed: 12 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/ast-spec/src/jsx/JSXNamespacedName/fixtures/component/snapshots/6-AST-Alignment-Tokens.shot

Lines changed: 12 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/ast-spec/tests/fixtures-with-differences-tokens.shot

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/eslint-plugin-internal/tests/fixtures/tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"compilerOptions": {
33
"jsx": "preserve",
4-
"target": "es5",
4+
"target": "es2015",
55
"module": "commonjs",
66
"strict": true,
7-
"esModuleInterop": true,
7+
"types": ["node"],
88
"lib": ["es2015", "es2017", "esnext"],
99
"experimentalDecorators": true
1010
},

packages/eslint-plugin/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"@typescript-eslint/visitor-keys": "workspace:*",
6666
"ignore": "^7.0.5",
6767
"natural-compare": "^1.4.0",
68-
"ts-api-utils": "^2.4.0"
68+
"ts-api-utils": "^2.5.0"
6969
},
7070
"devDependencies": {
7171
"@types/json-schema": "^7.0.15",
@@ -94,7 +94,7 @@
9494
"peerDependencies": {
9595
"@typescript-eslint/parser": "workspace:^",
9696
"eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
97-
"typescript": ">=4.8.4 <6.0.0"
97+
"typescript": ">=4.8.4 <6.1.0"
9898
},
9999
"funding": {
100100
"type": "opencollective",

packages/eslint-plugin/src/rules/no-base-to-string.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import {
99
getConstrainedTypeAtLocation,
1010
getParserServices,
1111
getTypeName,
12+
isSymbolFromDefaultLibrary,
1213
matchesTypeOrBaseType,
1314
nullThrows,
1415
} from '../util';
@@ -321,9 +322,10 @@ export default createRule<Options, MessageIds>({
321322
node.name.expression.expression.text === 'Symbol' &&
322323
ts.isIdentifier(node.name.expression.name) &&
323324
node.name.expression.name.text === 'toPrimitive' &&
324-
checker
325-
.getSymbolAtLocation(node.name.expression.expression)
326-
?.valueDeclaration?.getSourceFile().hasNoDefaultLib
325+
isSymbolFromDefaultLibrary(
326+
program,
327+
checker.getSymbolAtLocation(node.name.expression.expression),
328+
)
327329
);
328330
}
329331

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{
22
"extends": "./tsconfig.json",
33
"compilerOptions": {
4+
"module": "commonjs",
5+
"types": ["node", "react"],
46
"lib": ["esnext", "DOM"]
57
}
68
}

packages/eslint-plugin/tests/fixtures/tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"compilerOptions": {
33
"jsx": "preserve",
4-
"target": "es5",
4+
"target": "es2015",
55
"module": "commonjs",
66
"strict": true,
7-
"esModuleInterop": true,
7+
"types": ["node", "react"],
88
"lib": ["es2015", "es2017", "esnext"],
99
"experimentalDecorators": true
1010
},

packages/eslint-plugin/tests/fixtures/unstrict/tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"compilerOptions": {
33
"jsx": "preserve",
4-
"target": "es5",
4+
"target": "es2015",
55
"module": "commonjs",
66
"strict": false,
7-
"esModuleInterop": true,
7+
"types": ["node", "react"],
88
"lib": ["es2015", "es2017", "esnext"],
99
"experimentalDecorators": true
1010
},

0 commit comments

Comments
 (0)