Skip to content

Update TypeScript to 2.0 #2207

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.

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
Nov 9, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion lib/declarations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -369,4 +369,3 @@ interface IXcprojInfo {
*/
xcprojAvailable: boolean;
}

4 changes: 2 additions & 2 deletions lib/node-package-manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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;
Expand Down
5 changes: 3 additions & 2 deletions lib/services/analytics-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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> {
Expand Down
1 change: 0 additions & 1 deletion lib/services/plugin-variables-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -120,4 +120,3 @@ export class PluginVariablesService implements IPluginVariablesService {
}
}
$injector.register("pluginVariablesService", PluginVariablesService);

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
26 changes: 13 additions & 13 deletions test/project-service.ts
Original file line number Diff line number Diff line change
@@ -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 = {
Expand Down Expand Up @@ -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();
}

Expand Down Expand Up @@ -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());
Expand Down