Skip to content

Commit 52792c7

Browse files
cyrilletuzihansl
authored andcommitted
fix(@angular/cli): allow TS 2.5 for Angular >= 5.1
fix(@angular/cli): allow TS 2.5 for Angular >= 5.1 fix(@angular/cli): allow TS 2.5 for Angular >= 5.1
1 parent 40bba8d commit 52792c7

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,8 @@ export class Version {
169169
const versionCombos = [
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' },
172-
{ compiler: '>=5.0.0 <6.0.0', typescript: '>=2.4.2 <2.5.0' }
172+
{ 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' }
173174
];
174175

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

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

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

44

55
export default function () {
6-
// typescript@2.5 is not part of the officially supported range in latest stable.
6+
// typescript@2.6 is not part of the officially supported range in latest stable.
77
// Update as needed.
8-
let unsupportedTsVersion = '2.5';
8+
let unsupportedTsVersion = '2.6';
99

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

0 commit comments

Comments
 (0)