Skip to content

Commit f11c6ef

Browse files
authored
Merge pull request #25 from NativeScript/amiorkov/angular8
chore: upgrade to Angular 8
2 parents c516dbc + 9643a2e commit f11c6ef

File tree

6 files changed

+41
-42
lines changed

6 files changed

+41
-42
lines changed

demo-angular/package.json

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"nativescript": {
33
"id": "org.nativescript.picker.demoangular",
4-
"tns-android": {
4+
"tns-ios": {
55
"version": "5.4.0"
66
},
7-
"tns-ios": {
7+
"tns-android": {
88
"version": "5.4.0"
99
}
1010
},
@@ -16,27 +16,26 @@
1616
"e2e-watch": "tsc -p e2e --watch"
1717
},
1818
"dependencies": {
19-
"@angular/animations": "~7.2.0",
20-
"@angular/common": "~7.2.0",
21-
"@angular/compiler": "~7.2.0",
22-
"@angular/core": "~7.2.0",
23-
"@angular/forms": "~7.2.0",
24-
"@angular/http": "~7.2.0",
25-
"@angular/platform-browser": "~7.2.0",
26-
"@angular/platform-browser-dynamic": "~7.2.0",
27-
"@angular/router": "~7.2.0",
28-
"nativescript-angular": "~7.2.0",
19+
"@angular/animations": "~8.0.0",
20+
"@angular/common": "~8.0.0",
21+
"@angular/compiler": "~8.0.0",
22+
"@angular/core": "~8.0.0",
23+
"@angular/forms": "~8.0.0",
24+
"@angular/http": "8.0.0-beta.10",
25+
"@angular/platform-browser": "~8.0.0",
26+
"@angular/platform-browser-dynamic": "~8.0.0",
27+
"@angular/router": "~8.0.0",
28+
"nativescript-angular": "~8.0.0",
2929
"nativescript-picker": "file:../src",
3030
"nativescript-theme-core": "~1.0.4",
3131
"reflect-metadata": "~0.1.10",
32-
"rxjs": "~6.4.0",
33-
"tns-core-modules": "^5.0.0",
34-
"zone.js": "~0.8.18"
32+
"rxjs": "^6.3.3",
33+
"tns-core-modules": "^5.4.0",
34+
"zone.js": "^0.8.4",
35+
"typescript": "~3.4.5"
3536
},
3637
"devDependencies": {
37-
"@angular/compiler-cli": "~7.2.0",
3838
"@nativescript/schematics": "~0.5.0",
39-
"@ngtools/webpack": "~7.2.0",
4039
"@types/chai": "~4.1.7",
4140
"@types/mocha": "~5.2.5",
4241
"@types/node": "~10.12.18",
@@ -45,8 +44,8 @@
4544
"mocha-multi": "~1.0.1",
4645
"mochawesome": "^3.1.1",
4746
"nativescript-dev-appium": "~5.2.0",
48-
"nativescript-dev-typescript": "~0.9.0",
49-
"nativescript-dev-webpack": "~0.22.0",
47+
"nativescript-dev-typescript": "~0.10.0",
48+
"nativescript-dev-webpack": "~0.24.0",
5049
"tslint": "~5.11.0"
5150
},
5251
"readme": "NativeScript PickerField Demo NG"

demo-angular/src/app/examples/reactive-forms/reactive-forms-example.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { EventData } from "tns-core-modules/ui/core/view/view";
1313
})
1414
export class ReactiveFormsExampleComponent implements OnInit {
1515
public pickerItems: ObservableArray<Movie>;
16-
@ViewChild("picker") pickerComp: PickerFieldComponent;
16+
@ViewChild("picker", { static: false }) pickerComp: PickerFieldComponent;
1717

1818
constructor(private routerExtensions: RouterExtensions, private fb: FormBuilder) {
1919
this.pickerItems = new ObservableArray([

demo-angular/src/app/examples/value-api/value-api.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { DataItemService } from "../services/data-item.service";
1414
export class ValueAPIExampleComponent implements OnInit {
1515
public pickerItems: ObservableArray<DataItem>;
1616

17-
@ViewChild("myPicker") myPicker: PickerFieldComponent;
17+
@ViewChild("myPicker", { static: false }) myPicker: PickerFieldComponent;
1818

1919
constructor(private itemsService: DataItemService, private routerExtensions: RouterExtensions) {
2020
this.pickerItems = this.itemsService.getDataItems(20);

demo-vue/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
"mocha-multi": "~1.0.1",
3535
"mochawesome": "^3.1.1",
3636
"nativescript-dev-appium": "~5.2.0",
37-
"nativescript-dev-typescript": "~0.9.0",
38-
"nativescript-dev-webpack": "~0.22.0",
37+
"nativescript-dev-typescript": "~0.10.0",
38+
"nativescript-dev-webpack": "~0.24.0",
3939
"nativescript-vue-template-compiler": "~2.2.0",
4040
"node-sass": "~4.9.0",
4141
"vue-loader": "~15.4.0"

demo/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
"mocha-multi": "~1.0.1",
2323
"mochawesome": "^3.1.1",
2424
"nativescript-dev-appium": "~5.2.0",
25-
"nativescript-dev-typescript": "~0.9.0",
26-
"nativescript-dev-webpack": "~0.22.0",
25+
"nativescript-dev-typescript": "~0.10.0",
26+
"nativescript-dev-webpack": "~0.24.0",
2727
"tslint": "~5.11.0"
2828
},
2929
"scripts": {

src/package.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -48,26 +48,26 @@
4848
"homepage": "https://github.com/NativeScript/nativescript-picker",
4949
"readmeFilename": "README.md",
5050
"devDependencies": {
51-
"tns-core-modules": "^5.0.0",
52-
"tns-platform-declarations": "^5.0.0",
53-
"typescript": "~3.1.6",
51+
"@angular/common": "~8.0.0",
52+
"@angular/compiler": "~8.0.0",
53+
"@angular/compiler-cli": "~8.0.0",
54+
"@angular/core": "~8.0.0",
55+
"@angular/forms": "~8.0.0",
56+
"@angular/http": "8.0.0-beta.10",
57+
"@angular/platform-browser": "~8.0.0",
58+
"@angular/platform-browser-dynamic": "~8.0.0",
59+
"@angular/router": "~8.0.0",
60+
"nativescript-angular": "~8.0.0",
61+
"nativescript-vue": "~2.2.0",
5462
"prompt": "^1.0.0",
5563
"rimraf": "^2.6.2",
56-
"tslint": "^5.11.0",
57-
"semver": "^5.6.0",
58-
"nativescript-angular": "~7.2.0",
59-
"@angular/core": "~7.2.0",
60-
"@angular/common": "~7.2.0",
61-
"@angular/compiler": "~7.2.0",
62-
"@angular/compiler-cli": "~7.2.0",
63-
"@angular/forms": "~7.2.0",
64-
"@angular/http": "~7.2.0",
65-
"@angular/platform-browser": "~7.2.0",
66-
"@angular/platform-browser-dynamic": "~7.2.0",
67-
"@angular/router": "~7.2.0",
6864
"rxjs": "~6.4.0",
69-
"zone.js": "~0.8.26",
70-
"nativescript-vue": "~2.2.0"
65+
"semver": "^5.6.0",
66+
"tns-core-modules": "^5.0.0",
67+
"tns-platform-declarations": "^5.0.0",
68+
"tslint": "^5.11.0",
69+
"typescript": "~3.4.5",
70+
"zone.js": "~0.8.26"
7171
},
7272
"dependencies": {}
7373
}

0 commit comments

Comments
 (0)