Skip to content

Commit c0da687

Browse files
sis0k0hdeshev
sis0k0
authored and
hdeshev
committed
chore(deps): update TypeScript to 2.2 and target internal-preview of
tns-core-modules
1 parent 2546fc6 commit c0da687

File tree

7 files changed

+77
-87
lines changed

7 files changed

+77
-87
lines changed

Diff for: ‎nativescript-angular/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@
3939
"url": "0.10.3"
4040
},
4141
"devDependencies": {
42-
"typescript": "~2.1.0",
43-
"tslint": "~4.0.1",
44-
"codelyzer": "^2.0.0-beta.1",
4542
"@angular/compiler-cli": "~2.4.3",
46-
"tns-core-modules": ">=2.5.0 || >=2.5.0-2016",
43+
"codelyzer": "~2.0.0",
44+
"tns-core-modules": "internal-preview",
45+
"tslint": "~4.4.0",
46+
"typescript": "~2.2.0",
4747
"zone.js": "^0.7.2"
4848
},
4949
"nativescript": {}

Diff for: ‎nativescript-angular/platform-static.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Always import platform-common first - because polyfills
1+
// Always import platform-common first - because polyfills
22
import {
33
NativeScriptPlatformRef,
44
AppOptions,

Diff for: ‎nativescript-angular/platform.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Always import platform-common first - because polyfills
1+
// Always import platform-common first - because polyfills
22
import {
33
NativeScriptPlatformRef,
44
AppOptions,
@@ -49,7 +49,7 @@ export const NS_COMPILER_PROVIDERS = [
4949
},
5050
];
5151

52-
// Dynamic platform
52+
// Dynamic platform
5353
const _platformNativeScriptDynamic: PlatformFactory = createPlatformFactory(
5454
platformCoreDynamic, "nativeScriptDynamic", [...COMMON_PROVIDERS, ...NS_COMPILER_PROVIDERS]);
5555

Diff for: ‎nativescript-angular/router/ns-location-strategy.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ export class NSLocationStrategy extends LocationStrategy {
8787

8888
back(): void {
8989
if (this._isPageNavigationBack) {
90-
// We are navigating to the previous page
90+
// We are navigating to the previous page
9191
// clear the stack until we get to a page navigation state
9292
let state = this.states.pop();
9393
let count = 1;

Diff for: ‎ng-sample/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
},
2424
"homepage": "https://github.com/NativeScript/template-hello-world",
2525
"dependencies": {
26-
"tns-core-modules": "~2.5.0",
26+
"tns-core-modules": "internal-preview",
2727
"@angular/common": "~2.4.3",
2828
"@angular/compiler": "~2.4.3",
2929
"@angular/core": "~2.4.3",
@@ -45,7 +45,7 @@
4545
"nativescript-dev-typescript": "^0.3.1",
4646
"nativescript-dev-webpack": "0.0.13",
4747
"shelljs": "^0.7.0",
48-
"typescript": "~2.1.0"
48+
"typescript": "~2.2.0"
4949
},
5050
"nativescript": {
5151
"id": "org.nativescript.ngsample",

Diff for: ‎tests/npm-shrinkwrap.json

-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎tests/package.json

+67-67
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,70 @@
11
{
2-
"nativescript": {
3-
"id": "org.nativescript.ngtests",
4-
"tns-android": {
5-
"version": "2.4.1"
6-
},
7-
"tns-ios": {
8-
"version": "2.4.0"
9-
}
2+
"nativescript": {
3+
"id": "org.nativescript.ngtests",
4+
"tns-android": {
5+
"version": "2.5.0"
106
},
11-
"name": "ngtests",
12-
"main": "app.js",
13-
"version": "1.0.0",
14-
"author": "Telerik <[email protected]>",
15-
"description": "Angular tests",
16-
"license": "BSD",
17-
"keywords": [
18-
"telerik",
19-
"mobile",
20-
"angular",
21-
"nativescript",
22-
"{N}",
23-
"tns",
24-
"appbuilder",
25-
"template"
26-
],
27-
"homepage": "http://nativescript.org",
28-
"dependencies": {
29-
"nativescript-unit-test-runner": "^0.3.4",
30-
"tns-core-modules": "~2.5.0",
31-
"nativescript-angular": "file:../nativescript-angular",
32-
"@angular/core": "~2.4.3",
33-
"@angular/common": "~2.4.3",
34-
"@angular/compiler": "~2.4.3",
35-
"@angular/http": "~2.4.3",
36-
"@angular/platform-browser": "~2.4.3",
37-
"@angular/platform-browser-dynamic": "~2.4.3",
38-
"@angular/router": "~3.4.3",
39-
"rxjs": "~5.0.1"
40-
},
41-
"devDependencies": {
42-
"zone.js": "^0.7.2",
43-
"babel-traverse": "6.8.0",
44-
"babel-types": "6.8.1",
45-
"babylon": "6.8.0",
46-
"chai": "^3.5.0",
47-
"chai-as-promised": "^5.3.0",
48-
"filewalker": "0.1.2",
49-
"grunt-cli": "^1.2.0",
50-
"karma": "^0.13.19",
51-
"karma-chai": "^0.1.0",
52-
"karma-mocha": "^0.2.1",
53-
"karma-mocha-reporter": "^1.2.0",
54-
"karma-nativescript-launcher": "^0.4.0",
55-
"lazy": "1.0.11",
56-
"mocha": "^2.4.5",
57-
"nativescript-dev-appium": "0.0.14",
58-
"nativescript-dev-typescript": "^0.3.1",
59-
"typescript": "~2.1.0",
60-
"socket.io": "1.4.8",
61-
"socket.io-client": "1.4.8",
62-
"wd": "0.4.0"
63-
},
64-
"scripts": {
65-
"updateTests": "grunt updateTests",
66-
"appium-android": "tns build android && npm run run-appium-android",
67-
"run-appium-android": "nativescript-dev-appium android",
68-
"appium-ios-simulator": "tns build ios && nativescript-dev-appium ios-simulator"
7+
"tns-ios": {
8+
"version": "2.5.0"
699
}
70-
}
10+
},
11+
"name": "ngtests",
12+
"main": "app.js",
13+
"version": "1.0.0",
14+
"author": "Telerik <[email protected]>",
15+
"description": "Angular tests",
16+
"license": "BSD",
17+
"keywords": [
18+
"telerik",
19+
"mobile",
20+
"angular",
21+
"nativescript",
22+
"{N}",
23+
"tns",
24+
"appbuilder",
25+
"template"
26+
],
27+
"homepage": "http://nativescript.org",
28+
"dependencies": {
29+
"nativescript-unit-test-runner": "^0.3.4",
30+
"tns-core-modules": "internal-preview",
31+
"nativescript-angular": "file:../nativescript-angular",
32+
"@angular/common": "~2.4.3",
33+
"@angular/compiler": "~2.4.3",
34+
"@angular/core": "~2.4.3",
35+
"@angular/http": "~2.4.3",
36+
"@angular/platform-browser": "~2.4.3",
37+
"@angular/platform-browser-dynamic": "~2.4.3",
38+
"@angular/router": "~3.4.3",
39+
"rxjs": "~5.0.1"
40+
},
41+
"devDependencies": {
42+
"babel-traverse": "6.8.0",
43+
"babel-types": "6.8.1",
44+
"babylon": "6.8.0",
45+
"chai": "^3.5.0",
46+
"chai-as-promised": "^5.3.0",
47+
"filewalker": "0.1.2",
48+
"grunt-cli": "^1.2.0",
49+
"karma": "^0.13.19",
50+
"karma-chai": "^0.1.0",
51+
"karma-mocha": "^0.2.1",
52+
"karma-mocha-reporter": "^1.2.0",
53+
"karma-nativescript-launcher": "^0.4.0",
54+
"lazy": "1.0.11",
55+
"mocha": "^2.4.5",
56+
"nativescript-dev-appium": "0.0.14",
57+
"nativescript-dev-typescript": "^0.3.1",
58+
"socket.io": "1.4.8",
59+
"socket.io-client": "1.4.8",
60+
"typescript": "~2.2.0",
61+
"wd": "0.4.0",
62+
"zone.js": "^0.7.2"
63+
},
64+
"scripts": {
65+
"updateTests": "grunt updateTests",
66+
"appium-android": "tns build android && npm run run-appium-android",
67+
"run-appium-android": "nativescript-dev-appium android",
68+
"appium-ios-simulator": "tns build ios && nativescript-dev-appium ios-simulator"
69+
}
70+
}

0 commit comments

Comments
 (0)