Skip to content

Commit f8dde33

Browse files
devoto13Brocco
authored andcommitted
fix(@angular/cli): allow TS 2.6 for Angular >= 5.2
1 parent 2a25402 commit f8dde33

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

packages/@angular/cli/upgrade/version.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,8 @@ export class Version {
170170
{ compiler: '>=2.3.1 <3.0.0', typescript: '>=2.0.2 <2.3.0' },
171171
{ compiler: '>=4.0.0 <5.0.0', typescript: '>=2.1.0 <2.4.0' },
172172
{ compiler: '>=5.0.0 <5.1.0', typescript: '>=2.4.2 <2.5.0' },
173-
{ compiler: '>=5.1.0 <6.0.0', typescript: '>=2.4.2 <2.6.0' }
173+
{ compiler: '>=5.1.0 <5.2.0', typescript: '>=2.4.2 <2.6.0' },
174+
{ compiler: '>=5.2.0 <6.0.0', typescript: '>=2.4.2 <2.7.0' }
174175
];
175176

176177
const currentCombo = versionCombos.find((combo) => satisfies(compilerVersion, combo.compiler));

tests/e2e/tests/misc/typescript-warning.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ import { getGlobalVariable } from '../../utils/env';
33

44

55
export default function () {
6-
// [email protected] is not part of the officially supported range in latest stable.
7-
// Update as needed.
8-
let unsupportedTsVersion = '2.6';
6+
// [email protected] is not part of the officially supported range in latest stable.
7+
let unsupportedTsVersion = '2.7.0-dev.20180104';
98

109
// Skip this test in Angular 2/4.
1110
if (getGlobalVariable('argv').ng2 || getGlobalVariable('argv').ng4) {

0 commit comments

Comments
 (0)