Merge pull request #2207 from NativeScript/milanov/update-typescript-to-2.0

Update TypeScript to 2.0

Author: enchev

lib/common

@@ -369,4 +369,3 @@ interface IXcprojInfo {
 	 */
 	xcprojAvailable: boolean;
 }
-

lib/declarations.ts

@@ -120,7 +120,7 @@ export class NodePackageManager implements INodePackageManager {
 		let oldNpmPath: string = undefined;
 		let callback = (err: Error, data: any) => {
 			if (oldNpmPath) {
-				npm.prefix = oldNpmPath;
+				(<any>npm).prefix = oldNpmPath;
 			}
 
 			if (err) {
@@ -133,7 +133,7 @@ export class NodePackageManager implements INodePackageManager {
 
 		if (opts && opts.path) {
 			oldNpmPath = npm.prefix;
-			npm.prefix = opts.path;
+			(<any>npm).prefix = opts.path;
 		}
 
 		let subCommandName: string = opts.subCommandName;

lib/node-package-manager.ts

@@ -10,8 +10,9 @@ export class AnalyticsService extends AnalyticsServiceBase implements IAnalytics
 		$prompter: IPrompter,
 		$userSettingsService: UserSettings.IUserSettingsService,
 		$analyticsSettingsService: IAnalyticsSettingsService,
-		$progressIndicator: IProgressIndicator) {
-		super($logger, $options, $staticConfig, $errors, $prompter, $userSettingsService, $analyticsSettingsService, $progressIndicator);
+		$progressIndicator: IProgressIndicator,
+		$osInfo: IOsInfo) {
+		super($logger, $options, $staticConfig, $errors, $prompter, $userSettingsService, $analyticsSettingsService, $progressIndicator, $osInfo);
 	}
 
 	protected checkConsentCore(trackFeatureUsage: boolean): IFuture<void> {

lib/services/analytics-service.ts

@@ -120,4 +120,3 @@ export class PluginVariablesService implements IPluginVariablesService {
 	}
 }
 $injector.register("pluginVariablesService", PluginVariablesService);
-

lib/services/plugin-variables-service.ts

@@ -88,15 +88,15 @@
     "grunt-contrib-copy": "1.0.0",
     "grunt-contrib-watch": "1.0.0",
     "grunt-shell": "1.3.0",
-    "grunt-ts": "5.5.1",
-    "grunt-tslint": "3.1.0",
+    "grunt-ts": "6.0.0-beta.3",
+    "grunt-tslint": "3.3.0",
     "istanbul": "0.4.5",
     "mocha": "2.5.3",
     "mocha-fibers": "https://github.com/NativeScript/mocha-fibers.git",
     "mocha-typescript": "^1.0.4",
     "should": "7.0.2",
-    "tslint": "3.11.0",
-    "typescript": "^1.8.10"
+    "tslint": "3.15.1",
+    "typescript": "2.0.7"
   },
   "license": "Apache-2.0",
   "engines": {

package.json

@@ -1,24 +1,24 @@
 import * as yok from "../lib/common/yok";
 import * as stubs from "./stubs";
 import * as constants from "./../lib/constants";
-import {ChildProcess} from "../lib/common/child-process";
+import { ChildProcess } from "../lib/common/child-process";
 import * as ProjectServiceLib from "../lib/services/project-service";
-import {ProjectNameService} from "../lib/services/project-name-service";
+import { ProjectNameService } from "../lib/services/project-name-service";
 import * as ProjectDataServiceLib from "../lib/services/project-data-service";
 import * as ProjectDataLib from "../lib/project-data";
 import * as ProjectHelperLib from "../lib/common/project-helper";
-import {StaticConfig} from "../lib/config";
+import { StaticConfig } from "../lib/config";
 import * as NpmLib from "../lib/node-package-manager";
-import {NpmInstallationManager} from "../lib/npm-installation-manager";
+import { NpmInstallationManager } from "../lib/npm-installation-manager";
 import * as HttpClientLib from "../lib/common/http-client";
-import {FileSystem} from "../lib/common/file-system";
+import { FileSystem } from "../lib/common/file-system";
 import * as path from "path";
 import temp = require("temp");
-import * as helpers from "../lib/common/helpers";
-import {assert} from "chai";
-import {Options} from "../lib/options";
-import {HostInfo} from "../lib/common/host-info";
-import {ProjectTemplatesService} from "../lib/services/project-templates-service";
+import helpers = require("../lib/common/helpers");
+import { assert } from "chai";
+import { Options } from "../lib/options";
+import { HostInfo } from "../lib/common/host-info";
+import { ProjectTemplatesService } from "../lib/services/project-templates-service";
 import Future = require("fibers/future");
 
 let mockProjectNameValidator = {
@@ -52,10 +52,10 @@ class ProjectIntegrationTest {
 			let defaultTemplatePath = path.join(cacheRoot, packageName);
 			let latestVersion = npmInstallationManager.getLatestVersion(packageName).wait();
 
-			if(!fs.exists(path.join(defaultTemplatePath, latestVersion)).wait()) {
+			if (!fs.exists(path.join(defaultTemplatePath, latestVersion)).wait()) {
 				npmInstallationManager.addToCache(packageName, latestVersion).wait();
 			}
-			if(!fs.exists(path.join(defaultTemplatePath, latestVersion, "package", "app")).wait()) {
+			if (!fs.exists(path.join(defaultTemplatePath, latestVersion, "package", "app")).wait()) {
 				npmInstallationManager.cacheUnpack(packageName, latestVersion).wait();
 			}
 
@@ -461,7 +461,7 @@ describe("project upgrade procedure tests", () => {
 
 		try {
 			testInjector.resolve("projectData"); // This should trigger upgrade procedure
-		} catch(err) {
+		} catch (err) {
 			isErrorThrown = true;
 			let expectedErrorMessage = "No project found at or above '%s' and neither was a --path specified.," + tempFolder;
 			assert.equal(expectedErrorMessage, err.toString());