10000 feat: support TS 5.3 (#7968) · c0sta/typescript-eslint@fb50638 · GitHub
[go: up one dir, main page]
Skip to content

Commit fb50638

Browse files
bradzacherbradzacher
authored
feat: support TS 5.3 (typescript-eslint#7968)
1 parent d244b0e commit fb50638

File tree

12 files changed

+72
-202
lines changed

12 files changed

+72
-202
lines changed

‎.yarn/patches/typescript-npm-5.3.1-rc-6c4278ffd3.patch

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

‎.yarn/patches/typescript-npm-5.4.0-dev.20231117-78a04a34c5.patch

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

‎docs/maintenance/Dependency_Version_Upgrades.mdx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ See [chore: drop support for ESLint v6](https://github.com/typescript-eslint/typ
5151
The typescript-eslint repository contains three kinds of version ranges for Node:
5252

5353
- [`.github/workflows/ci.yml`](https://github.com/typescript-eslint/typescript-eslint/blob/main/.github/workflows/ci.yml)'s `PRIMARY_NODE_VERSION`: Set to the highest Node version we support
54-
- `node-version`: Set to a tuple of our [lowest, highest] supported versions for our unit tests in CI
54+
- `node-version`: Set to a tuple of our `[lowest, highest]` supported versions for our unit tests in CI
5555
- `engines` field in all `package.json`s: explicitly lists all supported Node ranges
5656

5757
Change those numbers accordingly when adding support for a new Node version or removing support for an old Node version.
@@ -97,8 +97,6 @@ We generally start the process of supporting a new TypeScript version just after
9797
- In the root `package.json`, change the `devDependency` on `typescript` to `~X.Y.3`
9898
- Rename and update `patches/typescript*` to the new TypeScript version
9999
- Any other changes made necessary due to changes in TypeScript between the RC version and stable version
100-
- Update the supported version range in [Users > Dependency Versions](../users/Dependency_Versions.mdx)
101-
1. Update [Users > Dependency Versions > TypeScript](../users/Dependency_Versions.mdx#typescript)
102100
1. Send a PR that updates this documentation page to point to your newer issues and PRs
103101
- Also update any of these steps if you go with a different process
104102

‎docs/users/Dependency_Versions.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import packageJson from '../../package.json';
77

88
## ESLint
99

10-
> The version range of ESLint currently supported is `^6.0.0 || ^7.0.0 || ^8.0.0`.
10+
> The version range of ESLint currently supported is `^7.0.0 || ^8.0.0`.
1111
1212
We generally support at least the latest two major versions of ESLint.
1313

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
"ts-node": "10.7.0",
115115
"tslint": "^6.1.3",
116116
"tsx": "^3.12.7",
117-
"typescript": ">=4.3.5 <5.4.0 || 5.3.0-beta || 5.3.1-rc || 5.4.0-dev.20231117"
117+
"typescript": ">=4.3.5 <5.4.0"
118118
},
119119
"resolutions": {
120120
"@jest/create-cache-key-function": "^29",
@@ -141,7 +141,7 @@
141141
"pretty-format": "^29",
142142
"react-split-pane@^0.1.92": "patch:react-split-pane@npm%3A0.1.92#./.yarn/patches/react-split-pane-npm-0.1.92-93dbf51dff.patch",
143143
"tsx": "^3.12.7",
144-
"typescript": "patch:typescript@npm%3A5.4.0-dev.20231117#./.yarn/patches/typescript-npm-5.4.0-dev.20231117-78a04a34c5.patch"
144+
"typescript": "5.3.2"
145145
},
146146
"packageManager": "yarn@3.7.0"
147147
}

‎packages/repo-tools/src/generate-lib.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ async function main(): Promise<void> {
211211

212212
// import and spread all of the references
213213
const imports = [
214-
"import { ImplicitLibVariableOptions } from '../variable';",
214+
"import type { ImplicitLibVariableOptions } from '../variable';",
215215
];
216216
for (const reference of references) {
217217
const name = sanitize(reference);
@@ -245,9 +245,9 @@ async function main(): Promise<void> {
245245

246246
if (requiredBaseImports.size > 0) {
247247
imports.push(
248-
`import {${Array.from(requiredBaseImports).join(
249-
',',
250-
)}} from './${BASE_CONFIG_MODULE_NAME}';`,
248+
`import {${Array.from(requiredBaseImports)
249+
.sort()
250+
.join(',')}} from './${BASE_CONFIG_MODULE_NAME}';`,
251251
);
252252
}
253253

‎packages/typescript-estree/src/node-utils.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ export function isComment(node: ts.Node): boolean {
191191
* @returns is JSDoc comment
192192
*/
193193
function isJSDocComment(node: ts.Node): node is ts.JSDoc {
194+
// eslint-disable-next-line deprecation/deprecation -- SyntaxKind.JSDoc was only added in TS4.7 so we can't use it yet
194195
return node.kind === SyntaxKind.JSDocComment;
195196
}
196197

‎packages/typescript-estree/src/parseSettings/warnAboutTSVersion.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ import type { ParseSettings } from './index';
66
* This needs to be kept in sync with /docs/users/Versioning.mdx
77
* in the typescript-eslint monorepo
88
*/
9-
const SUPPORTED_TYPESCRIPT_VERSIONS = '>=4.3.5 <5.3.0';
9+
const SUPPORTED_TYPESCRIPT_VERSIONS = '>=4.3.5 <5.4.0';
1010

1111
/*
1212
* The semver package will ignore prerelease ranges, and we don't want to explicitly document every one
1313
* List them all separately here, so we can automatically create the full string
1414
*/
15-
const SUPPORTED_PRERELEASE_RANGES: string[] = ['5.3.1-rc'];
15+
const SUPPORTED_PRERELEASE_RANGES: string[] = [];
1616
const ACTIVE_TYPESCRIPT_VERSION = ts.version;
1717
const isRunningSupportedTypeScriptVersion = semver.satisfies(
1818
ACTIVE_TYPESCRIPT_VERSION,

‎packages/typescript-estree/src/ts-estree/ts-nodes.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import type * as ts from 'typescript';
44
// Eg: https://github.com/typescript-eslint/typescript-eslint/issues/2388, https://github.com/typescript-eslint/typescript-eslint/issues/2784
55
/* eslint-disable @typescript-eslint/ban-ts-comment, @typescript-eslint/prefer-ts-expect-error, @typescript-eslint/no-empty-interface */
66
declare module 'typescript' {
7-
// @ts-ignore - added in TS 4.5
7+
/** @ts-ignore - added in TS 4.5, deprecated and converted to a type-alias in TS 5.3 */
88
export interface AssertClause extends ts.Node {}
9-
// @ts-ignore - added in TS 4.5
9+
/** @ts-ignore - added in TS 4.5, deprecated and converted to a type-alias in TS 5.3 */
1010
export interface AssertEntry extends ts.Node {}
1111
// added in TS 4.9
1212
export interface SatisfiesExpression extends ts.Node {}
@@ -25,6 +25,10 @@ export type TSNode =
2525
| ts.Identifier
2626
| ts.ImportAttribute
2727
| ts.ImportAttributes
28+
/* eslint-disable-next-line deprecation/deprecation, @typescript-eslint/no-duplicate-type-constituents -- intentional for old TS versions */
29+
| ts.AssertClause
30+
/* eslint-disable-next-line deprecation/deprecation, @typescript-eslint/no-duplicate-type-constituents -- intentional for old TS versions */
31+
| ts.AssertEntry
2832
| ts.PrivateIdentifier
2933
| ts.QualifiedName
3034
| ts.ComputedPropertyName

‎packages/typescript-estree/tsconfig.build.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"composite": true,
55
"outDir": "./dist",
66
"rootDir": "./src",
7-
"resolveJsonModule": true
7+
"resolveJsonModule": true,
8+
"removeComments": false
89
},
910
"include": ["src", "typings"],
1011
"references": [

0 commit comments

Comments
 (0)
0