Skip to content

Commit 6520411

Browse files
committed
chore(ts): Upgrade apps to latest modules and add path mappings.
1 parent e141cda commit 6520411

File tree

5 files changed

+30
-17
lines changed

5 files changed

+30
-17
lines changed

Diff for: nativescript-angular/package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -24,26 +24,26 @@
2424
"update-app-ng-deps": "./bin/update-app-ng-deps"
2525
},
2626
"dependencies": {
27-
"nativescript-intl": "~0.0.8",
28-
"@angular/core": "~2.4.3",
2927
"@angular/common": "~2.4.3",
3028
"@angular/compiler": "~2.4.3",
29+
"@angular/core": "~2.4.3",
30+
"@angular/forms": "~2.4.3",
3131
"@angular/http": "~2.4.3",
3232
"@angular/platform-browser": "~2.4.3",
33-
"@angular/forms": "~2.4.3",
3433
"@angular/router": "~3.4.3",
35-
"rxjs": "~5.0.1",
36-
"reflect-metadata": "~0.1.8",
34+
"nativescript-intl": "~0.0.8",
3735
"punycode": "1.3.2",
3836
"querystring": "0.2.0",
37+
"reflect-metadata": "~0.1.8",
38+
"rxjs": "~5.0.1",
3939
"url": "0.10.3"
4040
},
4141
"devDependencies": {
4242
"@angular/compiler-cli": "~2.4.3",
4343
"codelyzer": "~2.0.0",
4444
"tns-core-modules": "internal-preview",
4545
"tslint": "~4.4.0",
46-
"typescript": "~2.2.0",
46+
"typescript": "~2.2.1",
4747
"zone.js": "^0.7.2"
4848
},
4949
"nativescript": {}

Diff for: ng-sample/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
},
2424
"homepage": "https://github.com/NativeScript/template-hello-world",
2525
"dependencies": {
26-
"tns-core-modules": "internal-preview",
2726
"@angular/common": "~2.4.3",
2827
"@angular/compiler": "~2.4.3",
2928
"@angular/core": "~2.4.3",
@@ -33,7 +32,8 @@
3332
"@angular/platform-browser-dynamic": "~2.4.3",
3433
"@angular/router": "~3.4.3",
3534
"nativescript-angular": "file:../nativescript-angular",
36-
"rxjs": "~5.0.1"
35+
"rxjs": "~5.0.1",
36+
"tns-core-modules": "internal-preview"
3737
},
3838
"devDependencies": {
3939
"zone.js": "~0.7.2",
@@ -50,10 +50,10 @@
5050
"nativescript": {
5151
"id": "org.nativescript.ngsample",
5252
"tns-android": {
53-
"version": "2.4.1"
53+
"version": "2.5.0"
5454
},
5555
"tns-ios": {
5656
"version": "2.4.0"
5757
}
5858
}
59-
}
59+
}

Diff for: ng-sample/tsconfig.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,14 @@
1414
"es6",
1515
"dom",
1616
"es2015.iterable"
17-
]
17+
],
18+
"baseUrl": ".",
19+
"paths": {
20+
"*": [
21+
"./node_modules/tns-core-modules/*",
22+
"./node_modules/*"
23+
]
24+
}
1825
},
1926
"exclude": [
2027
"node_modules",

Diff for: tests/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@
2626
],
2727
"homepage": "http://nativescript.org",
2828
"dependencies": {
29-
"nativescript-unit-test-runner": "^0.3.4",
30-
"tns-core-modules": "internal-preview",
31-
"nativescript-angular": "file:../nativescript-angular",
3229
"@angular/common": "~2.4.3",
3330
"@angular/compiler": "~2.4.3",
3431
"@angular/core": "~2.4.3",
3532
"@angular/http": "~2.4.3",
3633
"@angular/platform-browser": "~2.4.3",
3734
"@angular/platform-browser-dynamic": "~2.4.3",
3835
"@angular/router": "~3.4.3",
39-
"rxjs": "~5.0.1"
36+
"nativescript-angular": "file:../nativescript-angular",
37+
"nativescript-unit-test-runner": "^0.3.4",
38+
"rxjs": "~5.0.1",
39+
"tns-core-modules": "internal-preview"
4040
},
4141
"devDependencies": {
4242
"babel-traverse": "6.8.0",

Diff for: tests/tsconfig.json

+8-2
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,20 @@
66
"experimentalDecorators": true,
77
"removeComments": false,
88
"emitDecoratorMetadata": true,
9-
"sourceMap": false,
109
"noEmitHelpers": true,
1110
"noEmitOnError": true,
1211
"lib": [
1312
"es6",
1413
"dom",
1514
"es2015.iterable"
16-
]
15+
],
16+
"baseUrl": ".",
17+
"paths": {
18+
"*": [
19+
"./node_modules/tns-core-modules/*",
20+
"./node_modules/*"
21+
]
22+
}
1723
},
1824
"exclude": [
1925
"node_modules",

0 commit comments

Comments
 (0)