Skip to content

Commit 3746709

Browse files
SvetoslavTsenovSvetoslavTsenov
authored
Svetoslavtsenov/ng 7 tests (#1584)
* chore: bump versions to Angular 7.0-rc.0 * chore: bump test apps deps * chore: include @angular/compiler-cli in the update script * chore: update to the official Angular 7.0 🎉 * chore: fix rxjs version
1 parent f755991 commit 3746709

File tree

8 files changed

+98
-93
lines changed

8 files changed

+98
-93
lines changed

Diff for: ‎e2e/modal-navigation-ng/package.json

+13-13
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,25 @@
1313
}
1414
},
1515
"dependencies": {
16-
"@angular/animations": "~6.1.0",
17-
"@angular/common": "~6.1.0",
18-
"@angular/compiler": "~6.1.0",
19-
"@angular/core": "~6.1.0",
20-
"@angular/forms": "~6.1.0",
21-
"@angular/http": "~6.1.0",
22-
"@angular/platform-browser": "~6.1.0",
23-
"@angular/platform-browser-dynamic": "~6.1.0",
24-
"@angular/router": "~6.1.0",
16+
"@angular/animations": "~7.0.0",
17+
"@angular/common": "~7.0.0",
18+
"@angular/compiler": "~7.0.0",
19+
"@angular/core": "~7.0.0",
20+
"@angular/forms": "~7.0.0",
21+
"@angular/http": "~7.0.0",
22+
"@angular/platform-browser": "~7.0.0",
23+
"@angular/platform-browser-dynamic": "~7.0.0",
24+
"@angular/router": "~7.0.0",
2525
"nativescript-angular": "file:../../nativescript-angular",
2626
"nativescript-theme-core": "~1.0.4",
2727
"reflect-metadata": "~0.1.8",
28-
"rxjs": "~6.1.0",
28+
"rxjs": "~6.3.3",
2929
"tns-core-modules": "next",
3030
"zone.js": "~0.8.2"
3131
},
3232
"devDependencies": {
33-
"@angular/compiler-cli": "~6.1.0",
34-
"@ngtools/webpack": "~6.1.0",
33+
"@ngtools/webpack": "~7.0.0",
34+
"@angular/compiler-cli": "~7.0.0",
3535
"@types/chai": "^4.0.2",
3636
"@types/mocha": "^2.2.41",
3737
"@types/node": "^7.0.5",
@@ -52,7 +52,7 @@
5252
"nativescript-worker-loader": "~0.9.0",
5353
"raw-loader": "~0.5.1",
5454
"resolve-url-loader": "~2.3.0",
55-
"typescript": "~2.7.2",
55+
"typescript": "~3.1.1",
5656
"uglifyjs-webpack-plugin": "~1.2.5",
5757
"webpack": "~4.6.0",
5858
"webpack-bundle-analyzer": "~2.13.0",

Diff for: ‎e2e/renderer/package.json

+12-12
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,23 @@
77
"id": "org.nativescript.renderer"
88
},
99
"dependencies": {
10-
"@angular/common": "~6.1.0",
11-
"@angular/compiler": "~6.1.0",
12-
"@angular/core": "~6.1.0",
13-
"@angular/forms": "~6.1.0",
14-
"@angular/http": "~6.1.0",
15-
"@angular/platform-browser": "~6.1.0",
16-
"@angular/platform-browser-dynamic": "~6.1.0",
17-
"@angular/router": "~6.1.0",
10+
"@angular/common": "~7.0.0",
11+
"@angular/compiler": "~7.0.0",
12+
"@angular/core": "~7.0.0",
13+
"@angular/forms": "~7.0.0",
14+
"@angular/http": "~7.0.0",
15+
"@angular/platform-browser": "~7.0.0",
16+
"@angular/platform-browser-dynamic": "~7.0.0",
17+
"@angular/router": "~7.0.0",
1818
"nativescript-angular": "file:../../nativescript-angular",
1919
"nativescript-intl": "^3.0.0",
2020
"reflect-metadata": "~0.1.8",
21-
"rxjs": "~6.1.0",
21+
"rxjs": "~6.3.3",
2222
"tns-core-modules": "next",
2323
"zone.js": "^0.8.4"
2424
},
2525
"devDependencies": {
26-
"@angular/compiler-cli": "~6.1.0",
26+
"@angular/compiler-cli": "~7.0.0",
2727
"@types/chai": "^4.0.2",
2828
"@types/mocha": "^2.2.41",
2929
"@types/node": "^7.0.5",
@@ -41,8 +41,8 @@
4141
"nativescript-dev-typescript": "~0.7.1",
4242
"nativescript-dev-webpack": "next",
4343
"tslib": "^1.7.1",
44-
"typescript": "~2.7.2",
45-
"@ngtools/webpack": "~6.1.0"
44+
"typescript": "~3.1.1",
45+
"@ngtools/webpack": "~7.0.0"
4646
},
4747
"scripts": {
4848
"e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json",

Diff for: ‎e2e/router-tab-view/package.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
}
1414
},
1515
"dependencies": {
16-
"@angular/animations": "~6.1.0",
17-
"@angular/common": "~6.1.0",
18-
"@angular/compiler": "~6.1.0",
19-
"@angular/core": "~6.1.0",
20-
"@angular/forms": "~6.1.0",
21-
"@angular/http": "~6.1.0",
22-
"@angular/platform-browser": "~6.1.0",
23-
"@angular/platform-browser-dynamic": "~6.1.0",
24-
"@angular/router": "~6.1.0",
16+
"@angular/animations": "~7.0.0",
17+
"@angular/common": "~7.0.0",
18+
"@angular/compiler": "~7.0.0",
19+
"@angular/core": "~7.0.0",
20+
"@angular/forms": "~7.0.0",
21+
"@angular/http": "~7.0.0",
22+
"@angular/platform-browser": "~7.0.0",
23+
"@angular/platform-browser-dynamic": "~7.0.0",
24+
"@angular/router": "~7.0.0",
2525
"nativescript-angular": "file:../../nativescript-angular",
2626
"nativescript-theme-core": "~1.0.4",
2727
"reflect-metadata": "~0.1.8",
@@ -42,7 +42,7 @@
4242
"mocha-multi": "~1.0.0",
4343
"nativescript-dev-appium": "next",
4444
"nativescript-dev-typescript": "~0.6.0",
45-
"typescript": "~2.7.2"
45+
"typescript": "~3.1.1"
4646
},
4747
"scripts": {
4848
"e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json",

Diff for: ‎e2e/router/package.json

+13-13
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,25 @@
77
"id": "org.nativescript.router"
88
},
99
"dependencies": {
10-
"@angular/animations": "~6.1.0",
11-
"@angular/common": "~6.1.0",
12-
"@angular/compiler": "~6.1.0",
13-
"@angular/core": "~6.1.0",
14-
"@angular/forms": "~6.1.0",
15-
"@angular/http": "~6.1.0",
16-
"@angular/platform-browser": "~6.1.0",
17-
"@angular/platform-browser-dynamic": "~6.1.0",
18-
"@angular/router": "~6.1.0",
10+
"@angular/animations": "~7.0.0",
11+
"@angular/common": "~7.0.0",
12+
"@angular/compiler": "~7.0.0",
13+
"@angular/core": "~7.0.0",
14+
"@angular/forms": "~7.0.0",
15+
"@angular/http": "~7.0.0",
16+
"@angular/platform-browser": "~7.0.0",
17+
"@angular/platform-browser-dynamic": "~7.0.0",
18+
"@angular/router": "~7.0.0",
1919
"nativescript-angular": "file:../../nativescript-angular",
2020
"nativescript-intl": "^3.0.0",
2121
"reflect-metadata": "~0.1.8",
22-
"rxjs": "~6.1.0",
22+
"rxjs": "~6.3.3",
2323
"tns-core-modules": "next",
2424
"zone.js": "^0.8.26"
2525
},
2626
"devDependencies": {
27-
"@ngtools/webpack": "~6.1.0",
28-
"@angular/compiler-cli": "~6.1.0",
27+
"@ngtools/webpack": "~7.0.0",
28+
"@angular/compiler-cli": "~7.0.0",
2929
"@types/chai": "^4.0.2",
3030
"@types/mocha": "^2.2.41",
3131
"@types/node": "^7.0.5",
@@ -43,7 +43,7 @@
4343
"nativescript-dev-typescript": "~0.4.0",
4444
"nativescript-dev-webpack": "next",
4545
"tslib": "^1.7.1",
46-
"typescript": "~2.7.2"
46+
"typescript": "~3.1.1"
4747
},
4848
"scripts": {
4949
"e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json",

Diff for: ‎e2e/single-page/package.json

+11-11
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
}
1414
},
1515
"dependencies": {
16-
"@angular/animations": "~6.1.0",
17-
"@angular/common": "~6.1.0",
18-
"@angular/compiler": "~6.1.0",
19-
"@angular/core": "~6.1.0",
20-
"@angular/forms": "~6.1.0",
21-
"@angular/http": "~6.1.0",
22-
"@angular/platform-browser": "~6.1.0",
23-
"@angular/platform-browser-dynamic": "~6.1.0",
24-
"@angular/router": "~6.1.0",
16+
"@angular/animations": "~7.0.0",
17+
"@angular/common": "~7.0.0",
18+
"@angular/compiler": "~7.0.0",
19+
"@angular/core": "~7.0.0",
20+
"@angular/forms": "~7.0.0",
21+
"@angular/http": "~7.0.0",
22+
"@angular/platform-browser": "~7.0.0",
23+
"@angular/platform-browser-dynamic": "~7.0.0",
24+
"@angular/router": "~7.0.0",
2525
"nativescript-angular": "file:../../nativescript-angular",
2626
"nativescript-intl": "^3.0.0",
2727
"reflect-metadata": "~0.1.8",
@@ -30,7 +30,7 @@
3030
"zone.js": "^0.8.4"
3131
},
3232
"devDependencies": {
33-
"@angular/compiler-cli": "~6.1.0",
33+
"@angular/compiler-cli": "~7.0.0",
3434
"@ngtools/webpack": "~6.2.0-beta.3",
3535
"@types/chai": "^4.0.2",
3636
"@types/mocha": "^2.2.41",
@@ -49,7 +49,7 @@
4949
"nativescript-dev-typescript": "next",
5050
"nativescript-dev-webpack": "next",
5151
"tslib": "^1.7.1",
52-
"typescript": "~2.7.2"
52+
"typescript": "~3.1.1"
5353
},
5454
"scripts": {
5555
"e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json",

Diff for: ‎nativescript-angular/bin/update-app-ng-deps

+7-2
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,14 @@ function updateDeps(deps, devDeps, newDeps) {
3131
console.log(`Updated dependency ${dependencyName} to version: ${version}.`);
3232
});
3333

34+
const ngDep = Object.keys(newDeps).find(dep => dep.startsWith("@angular"));
35+
const version = newDeps[ngDep];
3436
if (deps["@angular/animations"]) {
35-
const ngDep = Object.keys(newDeps).find(dep => dep.startsWith("@angular"));
36-
deps["@angular/animations"] = newDeps[ngDep];
37+
deps["@angular/animations"] = version;
38+
}
39+
40+
if (deps["@angular/compiler-cli"]) {
41+
deps["@angular/compiler-cli"] = version;
3742
}
3843
}
3944

Diff for: ‎nativescript-angular/package.json

+22-22
Original file line numberDiff line numberDiff line change
@@ -44,35 +44,35 @@
4444
"reflect-metadata": "^0.1.8"
4545
},
4646
"peerDependencies": {
47-
"@angular/platform-browser-dynamic": "~6.1.0",
48-
"@angular/common": "~6.1.0",
49-
"@angular/compiler": "~6.1.0",
50-
"@angular/core": "~6.1.0",
51-
"@angular/forms": "~6.1.0",
52-
"@angular/http": "~6.1.0",
53-
"@angular/platform-browser": "~6.1.0",
54-
"@angular/router": "~6.1.0",
55-
"rxjs": "^6.0.0",
47+
"@angular/platform-browser-dynamic": "~7.0.0",
48+
"@angular/common": "~7.0.0",
49+
"@angular/compiler": "~7.0.0",
50+
"@angular/core": "~7.0.0",
51+
"@angular/forms": "~7.0.0",
52+
"@angular/http": "~7.0.0",
53+
"@angular/platform-browser": "~7.0.0",
54+
"@angular/router": "~7.0.0",
55+
"rxjs": "^6.3.3",
5656
"tns-core-modules": "^4.0.0 || >4.0.0- || >4.1.0-",
5757
"zone.js": "^0.8.26",
58-
"typescript": "~2.7.2"
58+
"typescript": "~3.1.1"
5959
},
6060
"devDependencies": {
61-
"@angular/animations": "~6.1.0",
62-
"@angular/common": "~6.1.0",
63-
"@angular/compiler": "~6.1.0",
64-
"@angular/compiler-cli": "~6.1.0",
65-
"@angular/core": "~6.1.0",
66-
"@angular/forms": "~6.1.0",
67-
"@angular/http": "~6.1.0",
68-
"@angular/platform-browser": "~6.1.0",
69-
"@angular/platform-browser-dynamic": "~6.1.0",
70-
"@angular/router": "~6.1.0",
61+
"@angular/animations": "~7.0.0",
62+
"@angular/common": "~7.0.0",
63+
"@angular/compiler": "~7.0.0",
64+
"@angular/compiler-cli": "~7.0.0",
65+
"@angular/core": "~7.0.0",
66+
"@angular/forms": "~7.0.0",
67+
"@angular/http": "~7.0.0",
68+
"@angular/platform-browser": "~7.0.0",
69+
"@angular/platform-browser-dynamic": "~7.0.0",
70+
"@angular/router": "~7.0.0",
7171
"codelyzer": "^4.3.0",
72-
"rxjs": "~6.1.0",
72+
"rxjs": "~6.3.3",
7373
"tns-core-modules": "next",
7474
"tslint": "^5.5.0",
75-
"typescript": "~2.7.2",
75+
"typescript": "~3.1.1",
7676
"zone.js": "^0.8.26"
7777
}
7878
}

Diff for: ‎tests/package.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@
2626
],
2727
"homepage": "http://nativescript.org",
2828
"dependencies": {
29-
"@angular/animations": "~6.1.0",
30-
"@angular/common": "~6.1.0",
31-
"@angular/compiler": "~6.1.0",
32-
"@angular/core": "~6.1.0",
33-
"@angular/forms": "~6.1.0",
34-
"@angular/http": "~6.1.0",
35-
"@angular/platform-browser": "~6.1.0",
36-
"@angular/platform-browser-dynamic": "~6.1.0",
37-
"@angular/router": "~6.1.0",
29+
"@angular/animations": "~7.0.0",
30+
"@angular/common": "~7.0.0",
31+
"@angular/compiler": "~7.0.0",
32+
"@angular/core": "~7.0.0",
33+
"@angular/forms": "~7.0.0",
34+
"@angular/http": "~7.0.0",
35+
"@angular/platform-browser": "~7.0.0",
36+
"@angular/platform-browser-dynamic": "~7.0.0",
37+
"@angular/router": "~7.0.0",
3838
"nativescript-angular": "../nativescript-angular",
3939
"nativescript-unit-test-runner": "^0.3.4",
4040
"rxjs": "~6.0.0-rc.1",
@@ -57,7 +57,7 @@
5757
"babylon": "6.8.0",
5858
"lazy": "1.0.11",
5959
"tslint": "^4.5.1",
60-
"typescript": "~2.7.2"
60+
"typescript": "~3.1.1"
6161
},
6262
"scripts": {
6363
"e2e": "tsc -p e2e && mocha --opts ../e2e/config/mocha.opts --recursive e2e --appiumCapsLocation ../e2e/config/appium.capabilities.json",

0 commit comments

Comments
 (0)