From f118edf3b00c0b33dc97339b133dc5fa637e6bd2 Mon Sep 17 00:00:00 2001 From: Cyrille Tuzi Date: Thu, 7 Dec 2017 20:44:42 +0100 Subject: [PATCH] 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 --- packages/@angular/cli/upgrade/version.ts | 3 ++- tests/e2e/tests/misc/typescript-warning.ts | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/@angular/cli/upgrade/version.ts b/packages/@angular/cli/upgrade/version.ts index 0fcf5f226642..d8620acc4b74 100644 --- a/packages/@angular/cli/upgrade/version.ts +++ b/packages/@angular/cli/upgrade/version.ts @@ -169,7 +169,8 @@ export class Version { const versionCombos = [ { compiler: '>=2.3.1 <3.0.0', typescript: '>=2.0.2 <2.3.0' }, { compiler: '>=4.0.0 <5.0.0', typescript: '>=2.1.0 <2.4.0' }, - { compiler: '>=5.0.0 <6.0.0', typescript: '>=2.4.2 <2.5.0' } + { compiler: '>=5.0.0 <5.1.0', typescript: '>=2.4.2 <2.5.0' }, + { compiler: '>=5.1.0 <6.0.0', typescript: '>=2.4.2 <2.6.0' } ]; const currentCombo = versionCombos.find((combo) => satisfies(compilerVersion, combo.compiler)); diff --git a/tests/e2e/tests/misc/typescript-warning.ts b/tests/e2e/tests/misc/typescript-warning.ts index 28f695df101b..974470d750ce 100644 --- a/tests/e2e/tests/misc/typescript-warning.ts +++ b/tests/e2e/tests/misc/typescript-warning.ts @@ -3,9 +3,9 @@ import { getGlobalVariable } from '../../utils/env'; export default function () { - // typescript@2.5 is not part of the officially supported range in latest stable. + // typescript@2.6 is not part of the officially supported range in latest stable. // Update as needed. - let unsupportedTsVersion = '2.5'; + let unsupportedTsVersion = '2.6'; // Skip this test in Angular 2/4. if (getGlobalVariable('argv').ng2 || getGlobalVariable('argv').ng4) {