Skip to content
This repository was archived by the owner on Mar 25, 2021. It is now read-only.

Commit 0efa8ec

Browse files
authored
fix: add support for TypeScript 4.0 (#4943)
Closes #4941
1 parent 19fdb01 commit 0efa8ec

File tree

5 files changed

+16
-14
lines changed

5 files changed

+16
-14
lines changed

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@
4040
"mkdirp": "^0.5.3",
4141
"resolve": "^1.3.2",
4242
"semver": "^5.3.0",
43-
"tslib": "^1.10.0",
43+
"tslib": "^1.13.0",
4444
"tsutils": "^2.29.0"
4545
},
4646
"peerDependencies": {
47-
"typescript": ">=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >=3.0.0-dev || >= 3.1.0-dev || >= 3.2.0-dev"
47+
"typescript": ">=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >=3.0.0-dev || >= 3.1.0-dev || >= 3.2.0-dev || >= 4.0.0-dev"
4848
},
4949
"devDependencies": {
5050
"@octokit/rest": "^16.24.3",
@@ -73,7 +73,7 @@
7373
"tslint-config-prettier": "^1.18.0",
7474
"tslint-plugin-prettier": "^2.0.1",
7575
"tslint-test-config-non-relative": "file:test/external/tslint-test-config-non-relative",
76-
"typescript": "~3.8.2",
76+
"typescript": "~4.0.0-beta",
7777
"yarn-deduplicate": "^1.1.1"
7878
},
7979
"engines": {

src/rules/alignRule.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,9 @@ class AlignWalker extends Lint.AbstractWalker<Options> {
142142
case ts.SyntaxKind.TupleType:
143143
if (this.options.elements) {
144144
this.checkAlignment(
145-
(node as ts.TupleTypeNode).elementTypes,
145+
// In TS 4 TupleTypeNode.elementTypes has been updated to elements
146+
// tslint:disable-next-line
147+
(node as any).elementTypes || (node as ts.TupleTypeNode).elements,
146148
OPTION_ELEMENTS,
147149
);
148150
}

src/rules/noRedundantJsdocRule.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ function walk(ctx: Lint.WalkContext): void {
7373
);
7474
}
7575
break;
76-
76+
case ts.SyntaxKind.JSDocDeprecatedTag:
7777
case ts.SyntaxKind.JSDocAugmentsTag:
7878
case ts.SyntaxKind.JSDocAuthorTag:
7979
// OK

src/rules/oneLineRule.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ class OneLineWalker extends Lint.AbstractWalker<Options> {
8787
if (
8888
!isBlockLike(node.parent) ||
8989
(node.parent.kind === ts.SyntaxKind.CaseClause &&
90-
(node.parent as ts.CaseClause).statements.length === 1)
90+
node.parent.statements.length === 1)
9191
) {
9292
this.check({ pos: node.pos, end: (node as ts.Block).statements.pos });
9393
}

yarn.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1822,10 +1822,10 @@ tsconfig@^6.0.0:
18221822
strip-bom "^3.0.0"
18231823
strip-json-comments "^2.0.0"
18241824

1825-
tslib@^1.10.0, tslib@^1.7.1, tslib@^1.8.0, tslib@^1.8.1:
1826-
version "1.10.0"
1827-
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
1828-
integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
1825+
tslib@^1.13.0, tslib@^1.7.1, tslib@^1.8.0, tslib@^1.8.1:
1826+
version "1.13.0"
1827+
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
1828+
integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==
18291829

18301830
tslint-config-prettier@^1.18.0:
18311831
version "1.18.0"
@@ -1880,10 +1880,10 @@ type-detect@^1.0.0:
18801880
resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-1.0.0.tgz#762217cc06db258ec48908a1298e8b95121e8ea2"
18811881
integrity sha1-diIXzAbbJY7EiQihKY6LlRIejqI=
18821882

1883-
typescript@~3.8.2:
1884-
version "3.8.2"
1885-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.2.tgz#91d6868aaead7da74f493c553aeff76c0c0b1d5a"
1886-
integrity sha512-EgOVgL/4xfVrCMbhYKUQTdF37SQn4Iw73H5BgCrF1Abdun7Kwy/QZsE/ssAy0y4LxBbvua3PIbFsbRczWWnDdQ==
1883+
typescript@~4.0.0-beta:
1884+
version "4.0.0-dev.20200730"
1885+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.0-dev.20200730.tgz#0c1e874cbbfc702c32d9ac261c2f9dc9c37b14c1"
1886+
integrity sha512-bqw862eRy5niIZgCJTmn9DqkHTPoCF2eLlLA6jmOvubOgN8BNQrsaf+fE4PQkhzk9ae1/T9iAmDhapgmwWMHIA==
18871887

18881888
uglify-js@^3.1.4:
18891889
version "3.5.11"

0 commit comments

Comments
 (0)