chore: update typescript version for development. (angular#3783)

hansl · web-flow · commit 496c5e574594 · 2016-12-29T17:55:42.000-08:00
We still support typescript &gt;= 2.0, but this allows us to build using TS 2.1.

Note that TS 2.1 is still not compatible with Angular itself.
diff --git a/package.json b/package.json
@@ -41,7 +41,6 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-cli/ast-tools": "^1.0.0",
     "@angular/compiler": "^2.3.1",
     "@angular/compiler-cli": "^2.3.1",
     "@angular/core": "^2.3.1",
diff --git a/packages/@angular-cli/ast-tools/src/ast-utils.spec.ts b/packages/@angular-cli/ast-tools/src/ast-utils.spec.ts
@@ -296,5 +296,5 @@ function getNodesOfKind(kind: ts.SyntaxKind, sourceFile: string) {
 
 function getRootNode(sourceFile: string) {
   return ts.createSourceFile(sourceFile, fs.readFileSync(sourceFile).toString(),
-    ts.ScriptTarget.ES6, true);
+    ts.ScriptTarget.Latest, true);
 }
diff --git a/packages/@angular-cli/ast-tools/src/ast-utils.ts b/packages/@angular-cli/ast-tools/src/ast-utils.ts
@@ -29,7 +29,7 @@ import 'rxjs/add/operator/toPromise';
 */
 export function getSource(filePath: string): ts.SourceFile {
   return ts.createSourceFile(filePath, fs.readFileSync(filePath).toString(),
-    ts.ScriptTarget.ES6, true);
+    ts.ScriptTarget.Latest, true);
 }
 
 
diff --git a/packages/@angular-cli/ast-tools/src/change.ts b/packages/@angular-cli/ast-tools/src/change.ts
@@ -1,8 +1,8 @@
 import fs = require('fs');
 import denodeify = require('denodeify');
 
-const readFile = (denodeify(fs.readFile) as (...args: any[]) => Promise<string>);
-const writeFile = (denodeify(fs.writeFile) as (...args: any[]) => Promise<string>);
+const readFile = (denodeify(fs.readFile) as (...args: any[]) => Promise<any>);
+const writeFile = (denodeify(fs.writeFile) as (...args: any[]) => Promise<any>);
 
 export interface Host {
   write(path: string, content: string): Promise<void>;
diff --git a/packages/@angular-cli/ast-tools/src/route-utils.spec.ts b/packages/@angular-cli/ast-tools/src/route-utils.spec.ts
@@ -7,7 +7,7 @@ import denodeify = require('denodeify');
 import * as _ from 'lodash';
 import {it} from './spec-utils';
 
-const readFile = (denodeify(fs.readFile) as (...args: any[]) => Promise<string>);
+const readFile = (denodeify(fs.readFile) as (...args: any[]) => Promise<any>);
 
 
 describe('route utils', () => {
diff --git a/packages/@angular-cli/ast-tools/src/route-utils.ts b/packages/@angular-cli/ast-tools/src/route-utils.ts
@@ -553,5 +553,5 @@ function getValueForKey(objectLiteralNode: ts.Node, key: string) {
  * @param file
  */
 function getRootNode(file: string) {
-  return ts.createSourceFile(file, fs.readFileSync(file).toString(), ts.ScriptTarget.ES6, true);
+  return ts.createSourceFile(file, fs.readFileSync(file).toString(), ts.ScriptTarget.Latest, true);
 }
diff --git a/packages/angular-cli/commands/get.ts b/packages/angular-cli/commands/get.ts
@@ -11,7 +11,7 @@ const GetCommand = Command.extend({
   availableOptions: [],
 
   run: function (commandOptions: any, rawArgs: string[]): Promise<void> {
-    return new Promise(resolve => {
+    return new Promise<void>(resolve => {
       const config = CliConfig.fromProject();
       const value = config.get(rawArgs[0]);
 
diff --git a/packages/angular-cli/commands/set.ts b/packages/angular-cli/commands/set.ts
@@ -29,7 +29,7 @@ const SetCommand = Command.extend({
   },
 
   run: function (commandOptions: any, rawArgs: string[]): Promise<void> {
-    return new Promise(resolve => {
+    return new Promise<void>(resolve => {
       const [jsonPath, rawValue] = rawArgs;
       const config = CliConfig.fromProject();
       const type = config.typeOf(jsonPath);
diff --git a/packages/angular-cli/utilities/get-dependent-files.ts b/packages/angular-cli/utilities/get-dependent-files.ts
@@ -32,7 +32,7 @@ export interface ModuleMap {
 export function createTsSourceFile(fileName: string): Promise<ts.SourceFile> {
   return readFile(fileName, 'utf8')
     .then((contents: string) => {
-      return ts.createSourceFile(fileName, contents, ts.ScriptTarget.ES6, true);
+      return ts.createSourceFile(fileName, contents, ts.ScriptTarget.Latest, true);
     });
 }
 

Original file line number	Diff line number	Diff line change
`@@ -296,5 +296,5 @@ function getNodesOfKind(kind: ts.SyntaxKind, sourceFile: string) {`
`296`	`296`
`297`	`297`	`function getRootNode(sourceFile: string) {`
`298`	`298`	`return ts.createSourceFile(sourceFile, fs.readFileSync(sourceFile).toString(),`
`299`		`- ts.ScriptTarget.ES6, true);`
	`299`	`+ ts.ScriptTarget.Latest, true);`
`300`	`300`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ import 'rxjs/add/operator/toPromise';`
`29`	`29`	`*/`
`30`	`30`	`export function getSource(filePath: string): ts.SourceFile {`
`31`	`31`	`return ts.createSourceFile(filePath, fs.readFileSync(filePath).toString(),`
`32`		`- ts.ScriptTarget.ES6, true);`
	`32`	`+ ts.ScriptTarget.Latest, true);`
`33`	`33`	`}`
`34`	`34`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -553,5 +553,5 @@ function getValueForKey(objectLiteralNode: ts.Node, key: string) {`
`553`	`553`	`* @param file`
`554`	`554`	`*/`
`555`	`555`	`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);`
`557`	`557`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ export interface ModuleMap {`
`32`	`32`	`export function createTsSourceFile(fileName: string): Promise<ts.SourceFile> {`
`33`	`33`	`return readFile(fileName, 'utf8')`
`34`	`34`	`.then((contents: string) => {`
`35`		`- return ts.createSourceFile(fileName, contents, ts.ScriptTarget.ES6, true);`
	`35`	`+ return ts.createSourceFile(fileName, contents, ts.ScriptTarget.Latest, true);`
`36`	`36`	`});`
`37`	`37`	`}`
`38`	`38`