Skip to content

fix(@angular/cli): allow TS 2.5 for Angular >= 5.1 #8792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 14, 2017
Merged

fix(@angular/cli): allow TS 2.5 for Angular >= 5.1 #8792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/@angular/cli/upgrade/version.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
4 changes: 2 additions & 2 deletions tests/e2e/tests/misc/typescript-warning.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down