Skip to content

Commit 496c5e5

Browse files
authored
chore: update typescript version for development. (angular#3783)
We still support typescript >= 2.0, but this allows us to build using TS 2.1. Note that TS 2.1 is still not compatible with Angular itself.
1 parent d0224a5 commit 496c5e5

File tree

9 files changed

+9
-10
lines changed

9 files changed

+9
-10
lines changed

package.json

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
},
4242
"homepage": "https://github.com/angular/angular-cli",
4343
"dependencies": {
44-
"@angular-cli/ast-tools": "^1.0.0",
4544
"@angular/compiler": "^2.3.1",
4645
"@angular/compiler-cli": "^2.3.1",
4746
"@angular/core": "^2.3.1",

packages/@angular-cli/ast-tools/src/ast-utils.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -296,5 +296,5 @@ function getNodesOfKind(kind: ts.SyntaxKind, sourceFile: string) {
296296

297297
function getRootNode(sourceFile: string) {
298298
return ts.createSourceFile(sourceFile, fs.readFileSync(sourceFile).toString(),
299-
ts.ScriptTarget.ES6, true);
299+
ts.ScriptTarget.Latest, true);
300300
}

packages/@angular-cli/ast-tools/src/ast-utils.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import 'rxjs/add/operator/toPromise';
2929
*/
3030
export function getSource(filePath: string): ts.SourceFile {
3131
return ts.createSourceFile(filePath, fs.readFileSync(filePath).toString(),
32-
ts.ScriptTarget.ES6, true);
32+
ts.ScriptTarget.Latest, true);
3333
}
3434

3535

packages/@angular-cli/ast-tools/src/change.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import fs = require('fs');
22
import denodeify = require('denodeify');
33

4-
const readFile = (denodeify(fs.readFile) as (...args: any[]) => Promise<string>);
5-
const writeFile = (denodeify(fs.writeFile) as (...args: any[]) => Promise<string>);
4+
const readFile = (denodeify(fs.readFile) as (...args: any[]) => Promise<any>);
5+
const writeFile = (denodeify(fs.writeFile) as (...args: any[]) => Promise<any>);
66

77
export interface Host {
88
write(path: string, content: string): Promise<void>;

packages/@angular-cli/ast-tools/src/route-utils.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import denodeify = require('denodeify');
77
import * as _ from 'lodash';
88
import {it} from './spec-utils';
99

10-
const readFile = (denodeify(fs.readFile) as (...args: any[]) => Promise<string>);
10+
const readFile = (denodeify(fs.readFile) as (...args: any[]) => Promise<any>);
1111

1212

1313
describe('route utils', () => {

packages/@angular-cli/ast-tools/src/route-utils.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -553,5 +553,5 @@ function getValueForKey(objectLiteralNode: ts.Node, key: string) {
553553
* @param file
554554
*/
555555
function getRootNode(file: string) {
556-
return ts.createSourceFile(file, fs.readFileSync(file).toString(), ts.ScriptTarget.ES6, true);
556+
return ts.createSourceFile(file, fs.readFileSync(file).toString(), ts.ScriptTarget.Latest, true);
557557
}

packages/angular-cli/commands/get.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const GetCommand = Command.extend({
1111
availableOptions: [],
1212

1313
run: function (commandOptions: any, rawArgs: string[]): Promise<void> {
14-
return new Promise(resolve => {
14+
return new Promise<void>(resolve => {
1515
const config = CliConfig.fromProject();
1616
const value = config.get(rawArgs[0]);
1717

packages/angular-cli/commands/set.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const SetCommand = Command.extend({
2929
},
3030

3131
run: function (commandOptions: any, rawArgs: string[]): Promise<void> {
32-
return new Promise(resolve => {
32+
return new Promise<void>(resolve => {
3333
const [jsonPath, rawValue] = rawArgs;
3434
const config = CliConfig.fromProject();
3535
const type = config.typeOf(jsonPath);

packages/angular-cli/utilities/get-dependent-files.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export interface ModuleMap {
3232
export function createTsSourceFile(fileName: string): Promise<ts.SourceFile> {
3333
return readFile(fileName, 'utf8')
3434
.then((contents: string) => {
35-
return ts.createSourceFile(fileName, contents, ts.ScriptTarget.ES6, true);
35+
return ts.createSourceFile(fileName, contents, ts.ScriptTarget.Latest, true);
3636
});
3737
}
3838

0 commit comments

Comments
 (0)