From df177f677a335f0e2798f56187a33d31c482b615 Mon Sep 17 00:00:00 2001 From: sis0k0 Date: Thu, 4 Oct 2018 18:42:28 +0300 Subject: [PATCH 1/5] chore: bump versions to Angular 7.0-rc.0 --- nativescript-angular/package.json | 42 +++++++++++++++---------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/nativescript-angular/package.json b/nativescript-angular/package.json index 85f7a8162..fdd72adb9 100644 --- a/nativescript-angular/package.json +++ b/nativescript-angular/package.json @@ -44,35 +44,35 @@ "reflect-metadata": "^0.1.8" }, "peerDependencies": { - "@angular/platform-browser-dynamic": "~6.1.0", - "@angular/common": "~6.1.0", - "@angular/compiler": "~6.1.0", - "@angular/core": "~6.1.0", - "@angular/forms": "~6.1.0", - "@angular/http": "~6.1.0", - "@angular/platform-browser": "~6.1.0", - "@angular/router": "~6.1.0", + "@angular/platform-browser-dynamic": "~7.0.0-rc.0", + "@angular/common": "~7.0.0-rc.0", + "@angular/compiler": "~7.0.0-rc.0", + "@angular/core": "~7.0.0-rc.0", + "@angular/forms": "~7.0.0-rc.0", + "@angular/http": "~7.0.0-rc.0", + "@angular/platform-browser": "~7.0.0-rc.0", + "@angular/router": "~7.0.0-rc.0", "rxjs": "^6.0.0", "tns-core-modules": "^4.0.0 || >4.0.0- || >4.1.0-", "zone.js": "^0.8.26", - "typescript": "~2.7.2" + "typescript": "~3.1.1" }, "devDependencies": { - "@angular/animations": "~6.1.0", - "@angular/common": "~6.1.0", - "@angular/compiler": "~6.1.0", - "@angular/compiler-cli": "~6.1.0", - "@angular/core": "~6.1.0", - "@angular/forms": "~6.1.0", - "@angular/http": "~6.1.0", - "@angular/platform-browser": "~6.1.0", - "@angular/platform-browser-dynamic": "~6.1.0", - "@angular/router": "~6.1.0", + "@angular/animations": "~7.0.0-rc.0", + "@angular/common": "~7.0.0-rc.0", + "@angular/compiler": "~7.0.0-rc.0", + "@angular/compiler-cli": "~7.0.0-rc.0", + "@angular/core": "~7.0.0-rc.0", + "@angular/forms": "~7.0.0-rc.0", + "@angular/http": "~7.0.0-rc.0", + "@angular/platform-browser": "~7.0.0-rc.0", + "@angular/platform-browser-dynamic": "~7.0.0-rc.0", + "@angular/router": "~7.0.0-rc.0", "codelyzer": "^4.3.0", - "rxjs": "~6.1.0", + "rxjs": "~6.3.3", "tns-core-modules": "next", "tslint": "^5.5.0", - "typescript": "~2.7.2", + "typescript": "~3.1.1", "zone.js": "^0.8.26" } } From 26c5e165da8ac2bd4515e8f48ba3ccb1b4064126 Mon Sep 17 00:00:00 2001 From: sis0k0 Date: Thu, 4 Oct 2018 18:44:02 +0300 Subject: [PATCH 2/5] chore: bump test apps deps --- e2e/modal-navigation-ng/package.json | 26 +++++++++++++------------- e2e/renderer/package.json | 24 ++++++++++++------------ e2e/router-tab-view/package.json | 20 ++++++++++---------- e2e/router/package.json | 26 +++++++++++++------------- e2e/single-page/package.json | 22 +++++++++++----------- tests/package.json | 20 ++++++++++---------- 6 files changed, 69 insertions(+), 69 deletions(-) diff --git a/e2e/modal-navigation-ng/package.json b/e2e/modal-navigation-ng/package.json index 2d1b54d97..ca58f12dd 100644 --- a/e2e/modal-navigation-ng/package.json +++ b/e2e/modal-navigation-ng/package.json @@ -13,25 +13,25 @@ } }, "dependencies": { - "@angular/animations": "~6.1.0", - "@angular/common": "~6.1.0", - "@angular/compiler": "~6.1.0", - "@angular/core": "~6.1.0", - "@angular/forms": "~6.1.0", - "@angular/http": "~6.1.0", - "@angular/platform-browser": "~6.1.0", - "@angular/platform-browser-dynamic": "~6.1.0", - "@angular/router": "~6.1.0", + "@angular/animations": "~7.0.0-rc.0", + "@angular/common": "~7.0.0-rc.0", + "@angular/compiler": "~7.0.0-rc.0", + "@angular/core": "~7.0.0-rc.0", + "@angular/forms": "~7.0.0-rc.0", + "@angular/http": "~7.0.0-rc.0", + "@angular/platform-browser": "~7.0.0-rc.0", + "@angular/platform-browser-dynamic": "~7.0.0-rc.0", + "@angular/router": "~7.0.0-rc.0", "nativescript-angular": "file:../../nativescript-angular", "nativescript-theme-core": "~1.0.4", "reflect-metadata": "~0.1.8", - "rxjs": "~6.1.0", + "rxjs": "~7.0.0-rc.0", "tns-core-modules": "next", "zone.js": "~0.8.2" }, "devDependencies": { - "@angular/compiler-cli": "~6.1.0", - "@ngtools/webpack": "~6.1.0", + "@ngtools/webpack": "~7.0.0-rc.0", + "@angular/compiler-cli": "~7.0.0-rc.0", "@types/chai": "^4.0.2", "@types/mocha": "^2.2.41", "@types/node": "^7.0.5", @@ -52,7 +52,7 @@ "nativescript-worker-loader": "~0.9.0", "raw-loader": "~0.5.1", "resolve-url-loader": "~2.3.0", - "typescript": "~2.7.2", + "typescript": "~3.1.1", "uglifyjs-webpack-plugin": "~1.2.5", "webpack": "~4.6.0", "webpack-bundle-analyzer": "~2.13.0", diff --git a/e2e/renderer/package.json b/e2e/renderer/package.json index 4a83c5f87..3538071bd 100644 --- a/e2e/renderer/package.json +++ b/e2e/renderer/package.json @@ -7,23 +7,23 @@ "id": "org.nativescript.renderer" }, "dependencies": { - "@angular/common": "~6.1.0", - "@angular/compiler": "~6.1.0", - "@angular/core": "~6.1.0", - "@angular/forms": "~6.1.0", - "@angular/http": "~6.1.0", - "@angular/platform-browser": "~6.1.0", - "@angular/platform-browser-dynamic": "~6.1.0", - "@angular/router": "~6.1.0", + "@angular/common": "~7.0.0-rc.0", + "@angular/compiler": "~7.0.0-rc.0", + "@angular/core": "~7.0.0-rc.0", + "@angular/forms": "~7.0.0-rc.0", + "@angular/http": "~7.0.0-rc.0", + "@angular/platform-browser": "~7.0.0-rc.0", + "@angular/platform-browser-dynamic": "~7.0.0-rc.0", + "@angular/router": "~7.0.0-rc.0", "nativescript-angular": "file:../../nativescript-angular", "nativescript-intl": "^3.0.0", "reflect-metadata": "~0.1.8", - "rxjs": "~6.1.0", + "rxjs": "~7.0.0-rc.0", "tns-core-modules": "next", "zone.js": "^0.8.4" }, "devDependencies": { - "@angular/compiler-cli": "~6.1.0", + "@angular/compiler-cli": "~7.0.0-rc.0", "@types/chai": "^4.0.2", "@types/mocha": "^2.2.41", "@types/node": "^7.0.5", @@ -41,8 +41,8 @@ "nativescript-dev-typescript": "~0.7.1", "nativescript-dev-webpack": "next", "tslib": "^1.7.1", - "typescript": "~2.7.2", - "@ngtools/webpack": "~6.1.0" + "typescript": "~3.1.1", + "@ngtools/webpack": "~7.0.0-rc.0" }, "scripts": { "e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json", diff --git a/e2e/router-tab-view/package.json b/e2e/router-tab-view/package.json index 334eedea7..2b8caec03 100644 --- a/e2e/router-tab-view/package.json +++ b/e2e/router-tab-view/package.json @@ -13,15 +13,15 @@ } }, "dependencies": { - "@angular/animations": "~6.1.0", - "@angular/common": "~6.1.0", - "@angular/compiler": "~6.1.0", - "@angular/core": "~6.1.0", - "@angular/forms": "~6.1.0", - "@angular/http": "~6.1.0", - "@angular/platform-browser": "~6.1.0", - "@angular/platform-browser-dynamic": "~6.1.0", - "@angular/router": "~6.1.0", + "@angular/animations": "~7.0.0-rc.0", + "@angular/common": "~7.0.0-rc.0", + "@angular/compiler": "~7.0.0-rc.0", + "@angular/core": "~7.0.0-rc.0", + "@angular/forms": "~7.0.0-rc.0", + "@angular/http": "~7.0.0-rc.0", + "@angular/platform-browser": "~7.0.0-rc.0", + "@angular/platform-browser-dynamic": "~7.0.0-rc.0", + "@angular/router": "~7.0.0-rc.0", "nativescript-angular": "file:../../nativescript-angular", "nativescript-theme-core": "~1.0.4", "reflect-metadata": "~0.1.8", @@ -42,7 +42,7 @@ "mocha-multi": "~1.0.0", "nativescript-dev-appium": "next", "nativescript-dev-typescript": "~0.6.0", - "typescript": "~2.7.2" + "typescript": "~3.1.1" }, "scripts": { "e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json", diff --git a/e2e/router/package.json b/e2e/router/package.json index 323c7000d..a621b637e 100644 --- a/e2e/router/package.json +++ b/e2e/router/package.json @@ -7,25 +7,25 @@ "id": "org.nativescript.router" }, "dependencies": { - "@angular/animations": "~6.1.0", - "@angular/common": "~6.1.0", - "@angular/compiler": "~6.1.0", - "@angular/core": "~6.1.0", - "@angular/forms": "~6.1.0", - "@angular/http": "~6.1.0", - "@angular/platform-browser": "~6.1.0", - "@angular/platform-browser-dynamic": "~6.1.0", - "@angular/router": "~6.1.0", + "@angular/animations": "~7.0.0-rc.0", + "@angular/common": "~7.0.0-rc.0", + "@angular/compiler": "~7.0.0-rc.0", + "@angular/core": "~7.0.0-rc.0", + "@angular/forms": "~7.0.0-rc.0", + "@angular/http": "~7.0.0-rc.0", + "@angular/platform-browser": "~7.0.0-rc.0", + "@angular/platform-browser-dynamic": "~7.0.0-rc.0", + "@angular/router": "~7.0.0-rc.0", "nativescript-angular": "file:../../nativescript-angular", "nativescript-intl": "^3.0.0", "reflect-metadata": "~0.1.8", - "rxjs": "~6.1.0", + "rxjs": "~7.0.0-rc.0", "tns-core-modules": "next", "zone.js": "^0.8.26" }, "devDependencies": { - "@ngtools/webpack": "~6.1.0", - "@angular/compiler-cli": "~6.1.0", + "@ngtools/webpack": "~7.0.0-rc.0", + "@angular/compiler-cli": "~7.0.0-rc.0", "@types/chai": "^4.0.2", "@types/mocha": "^2.2.41", "@types/node": "^7.0.5", @@ -43,7 +43,7 @@ "nativescript-dev-typescript": "~0.4.0", "nativescript-dev-webpack": "next", "tslib": "^1.7.1", - "typescript": "~2.7.2" + "typescript": "~3.1.1" }, "scripts": { "e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json", diff --git a/e2e/single-page/package.json b/e2e/single-page/package.json index 0ac534b12..e87e182d3 100644 --- a/e2e/single-page/package.json +++ b/e2e/single-page/package.json @@ -13,15 +13,15 @@ } }, "dependencies": { - "@angular/animations": "~6.1.0", - "@angular/common": "~6.1.0", - "@angular/compiler": "~6.1.0", - "@angular/core": "~6.1.0", - "@angular/forms": "~6.1.0", - "@angular/http": "~6.1.0", - "@angular/platform-browser": "~6.1.0", - "@angular/platform-browser-dynamic": "~6.1.0", - "@angular/router": "~6.1.0", + "@angular/animations": "~7.0.0-rc.0", + "@angular/common": "~7.0.0-rc.0", + "@angular/compiler": "~7.0.0-rc.0", + "@angular/core": "~7.0.0-rc.0", + "@angular/forms": "~7.0.0-rc.0", + "@angular/http": "~7.0.0-rc.0", + "@angular/platform-browser": "~7.0.0-rc.0", + "@angular/platform-browser-dynamic": "~7.0.0-rc.0", + "@angular/router": "~7.0.0-rc.0", "nativescript-angular": "file:../../nativescript-angular", "nativescript-intl": "^3.0.0", "reflect-metadata": "~0.1.8", @@ -30,7 +30,7 @@ "zone.js": "^0.8.4" }, "devDependencies": { - "@angular/compiler-cli": "~6.1.0", + "@angular/compiler-cli": "~7.0.0-rc.0", "@ngtools/webpack": "~6.2.0-beta.3", "@types/chai": "^4.0.2", "@types/mocha": "^2.2.41", @@ -49,7 +49,7 @@ "nativescript-dev-typescript": "next", "nativescript-dev-webpack": "next", "tslib": "^1.7.1", - "typescript": "~2.7.2" + "typescript": "~3.1.1" }, "scripts": { "e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json", diff --git a/tests/package.json b/tests/package.json index 5baa66b2e..ade7fe807 100644 --- a/tests/package.json +++ b/tests/package.json @@ -26,15 +26,15 @@ ], "homepage": "http://nativescript.org", "dependencies": { - "@angular/animations": "~6.1.0", - "@angular/common": "~6.1.0", - "@angular/compiler": "~6.1.0", - "@angular/core": "~6.1.0", - "@angular/forms": "~6.1.0", - "@angular/http": "~6.1.0", - "@angular/platform-browser": "~6.1.0", - "@angular/platform-browser-dynamic": "~6.1.0", - "@angular/router": "~6.1.0", + "@angular/animations": "~7.0.0-rc.0", + "@angular/common": "~7.0.0-rc.0", + "@angular/compiler": "~7.0.0-rc.0", + "@angular/core": "~7.0.0-rc.0", + "@angular/forms": "~7.0.0-rc.0", + "@angular/http": "~7.0.0-rc.0", + "@angular/platform-browser": "~7.0.0-rc.0", + "@angular/platform-browser-dynamic": "~7.0.0-rc.0", + "@angular/router": "~7.0.0-rc.0", "nativescript-angular": "../nativescript-angular", "nativescript-unit-test-runner": "^0.3.4", "rxjs": "~6.0.0-rc.1", @@ -57,7 +57,7 @@ "babylon": "6.8.0", "lazy": "1.0.11", "tslint": "^4.5.1", - "typescript": "~2.7.2" + "typescript": "~3.1.1" }, "scripts": { "e2e": "tsc -p e2e && mocha --opts ../e2e/config/mocha.opts --recursive e2e --appiumCapsLocation ../e2e/config/appium.capabilities.json", From 224867dd75162ecaeeb16a149bd45fdd02936b72 Mon Sep 17 00:00:00 2001 From: sis0k0 Date: Thu, 4 Oct 2018 19:16:48 +0300 Subject: [PATCH 3/5] chore: include @angular/compiler-cli in the update script --- nativescript-angular/bin/update-app-ng-deps | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/nativescript-angular/bin/update-app-ng-deps b/nativescript-angular/bin/update-app-ng-deps index c73de3e66..f52904c52 100755 --- a/nativescript-angular/bin/update-app-ng-deps +++ b/nativescript-angular/bin/update-app-ng-deps @@ -31,9 +31,14 @@ function updateDeps(deps, devDeps, newDeps) { console.log(`Updated dependency ${dependencyName} to version: ${version}.`); }); + const ngDep = Object.keys(newDeps).find(dep => dep.startsWith("@angular")); + const version = newDeps[ngDep]; if (deps["@angular/animations"]) { - const ngDep = Object.keys(newDeps).find(dep => dep.startsWith("@angular")); - deps["@angular/animations"] = newDeps[ngDep]; + deps["@angular/animations"] = version; + } + + if (deps["@angular/compiler-cli"]) { + deps["@angular/compiler-cli"] = version; } } From c7032004396b5db255b1fcc22d260e4e26726e31 Mon Sep 17 00:00:00 2001 From: sis0k0 Date: Thu, 18 Oct 2018 21:54:35 +0300 Subject: [PATCH 4/5] chore: update to the official Angular 7.0 :tada: --- e2e/modal-navigation-ng/package.json | 24 +++++++++---------- e2e/renderer/package.json | 22 ++++++++--------- e2e/router-tab-view/package.json | 18 +++++++------- e2e/router/package.json | 24 +++++++++---------- e2e/single-page/package.json | 20 ++++++++-------- nativescript-angular/package.json | 36 ++++++++++++++-------------- tests/package.json | 18 +++++++------- 7 files changed, 81 insertions(+), 81 deletions(-) diff --git a/e2e/modal-navigation-ng/package.json b/e2e/modal-navigation-ng/package.json index ca58f12dd..61ad9f306 100644 --- a/e2e/modal-navigation-ng/package.json +++ b/e2e/modal-navigation-ng/package.json @@ -13,25 +13,25 @@ } }, "dependencies": { - "@angular/animations": "~7.0.0-rc.0", - "@angular/common": "~7.0.0-rc.0", - "@angular/compiler": "~7.0.0-rc.0", - "@angular/core": "~7.0.0-rc.0", - "@angular/forms": "~7.0.0-rc.0", - "@angular/http": "~7.0.0-rc.0", - "@angular/platform-browser": "~7.0.0-rc.0", - "@angular/platform-browser-dynamic": "~7.0.0-rc.0", - "@angular/router": "~7.0.0-rc.0", + "@angular/animations": "~7.0.0", + "@angular/common": "~7.0.0", + "@angular/compiler": "~7.0.0", + "@angular/core": "~7.0.0", + "@angular/forms": "~7.0.0", + "@angular/http": "~7.0.0", + "@angular/platform-browser": "~7.0.0", + "@angular/platform-browser-dynamic": "~7.0.0", + "@angular/router": "~7.0.0", "nativescript-angular": "file:../../nativescript-angular", "nativescript-theme-core": "~1.0.4", "reflect-metadata": "~0.1.8", - "rxjs": "~7.0.0-rc.0", + "rxjs": "~7.0.0", "tns-core-modules": "next", "zone.js": "~0.8.2" }, "devDependencies": { - "@ngtools/webpack": "~7.0.0-rc.0", - "@angular/compiler-cli": "~7.0.0-rc.0", + "@ngtools/webpack": "~7.0.0", + "@angular/compiler-cli": "~7.0.0", "@types/chai": "^4.0.2", "@types/mocha": "^2.2.41", "@types/node": "^7.0.5", diff --git a/e2e/renderer/package.json b/e2e/renderer/package.json index 3538071bd..b6f43cecc 100644 --- a/e2e/renderer/package.json +++ b/e2e/renderer/package.json @@ -7,23 +7,23 @@ "id": "org.nativescript.renderer" }, "dependencies": { - "@angular/common": "~7.0.0-rc.0", - "@angular/compiler": "~7.0.0-rc.0", - "@angular/core": "~7.0.0-rc.0", - "@angular/forms": "~7.0.0-rc.0", - "@angular/http": "~7.0.0-rc.0", - "@angular/platform-browser": "~7.0.0-rc.0", - "@angular/platform-browser-dynamic": "~7.0.0-rc.0", - "@angular/router": "~7.0.0-rc.0", + "@angular/common": "~7.0.0", + "@angular/compiler": "~7.0.0", + "@angular/core": "~7.0.0", + "@angular/forms": "~7.0.0", + "@angular/http": "~7.0.0", + "@angular/platform-browser": "~7.0.0", + "@angular/platform-browser-dynamic": "~7.0.0", + "@angular/router": "~7.0.0", "nativescript-angular": "file:../../nativescript-angular", "nativescript-intl": "^3.0.0", "reflect-metadata": "~0.1.8", - "rxjs": "~7.0.0-rc.0", + "rxjs": "~7.0.0", "tns-core-modules": "next", "zone.js": "^0.8.4" }, "devDependencies": { - "@angular/compiler-cli": "~7.0.0-rc.0", + "@angular/compiler-cli": "~7.0.0", "@types/chai": "^4.0.2", "@types/mocha": "^2.2.41", "@types/node": "^7.0.5", @@ -42,7 +42,7 @@ "nativescript-dev-webpack": "next", "tslib": "^1.7.1", "typescript": "~3.1.1", - "@ngtools/webpack": "~7.0.0-rc.0" + "@ngtools/webpack": "~7.0.0" }, "scripts": { "e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json", diff --git a/e2e/router-tab-view/package.json b/e2e/router-tab-view/package.json index 2b8caec03..5dc6eac6c 100644 --- a/e2e/router-tab-view/package.json +++ b/e2e/router-tab-view/package.json @@ -13,15 +13,15 @@ } }, "dependencies": { - "@angular/animations": "~7.0.0-rc.0", - "@angular/common": "~7.0.0-rc.0", - "@angular/compiler": "~7.0.0-rc.0", - "@angular/core": "~7.0.0-rc.0", - "@angular/forms": "~7.0.0-rc.0", - "@angular/http": "~7.0.0-rc.0", - "@angular/platform-browser": "~7.0.0-rc.0", - "@angular/platform-browser-dynamic": "~7.0.0-rc.0", - "@angular/router": "~7.0.0-rc.0", + "@angular/animations": "~7.0.0", + "@angular/common": "~7.0.0", + "@angular/compiler": "~7.0.0", + "@angular/core": "~7.0.0", + "@angular/forms": "~7.0.0", + "@angular/http": "~7.0.0", + "@angular/platform-browser": "~7.0.0", + "@angular/platform-browser-dynamic": "~7.0.0", + "@angular/router": "~7.0.0", "nativescript-angular": "file:../../nativescript-angular", "nativescript-theme-core": "~1.0.4", "reflect-metadata": "~0.1.8", diff --git a/e2e/router/package.json b/e2e/router/package.json index a621b637e..4cf4a98ad 100644 --- a/e2e/router/package.json +++ b/e2e/router/package.json @@ -7,25 +7,25 @@ "id": "org.nativescript.router" }, "dependencies": { - "@angular/animations": "~7.0.0-rc.0", - "@angular/common": "~7.0.0-rc.0", - "@angular/compiler": "~7.0.0-rc.0", - "@angular/core": "~7.0.0-rc.0", - "@angular/forms": "~7.0.0-rc.0", - "@angular/http": "~7.0.0-rc.0", - "@angular/platform-browser": "~7.0.0-rc.0", - "@angular/platform-browser-dynamic": "~7.0.0-rc.0", - "@angular/router": "~7.0.0-rc.0", + "@angular/animations": "~7.0.0", + "@angular/common": "~7.0.0", + "@angular/compiler": "~7.0.0", + "@angular/core": "~7.0.0", + "@angular/forms": "~7.0.0", + "@angular/http": "~7.0.0", + "@angular/platform-browser": "~7.0.0", + "@angular/platform-browser-dynamic": "~7.0.0", + "@angular/router": "~7.0.0", "nativescript-angular": "file:../../nativescript-angular", "nativescript-intl": "^3.0.0", "reflect-metadata": "~0.1.8", - "rxjs": "~7.0.0-rc.0", + "rxjs": "~7.0.0", "tns-core-modules": "next", "zone.js": "^0.8.26" }, "devDependencies": { - "@ngtools/webpack": "~7.0.0-rc.0", - "@angular/compiler-cli": "~7.0.0-rc.0", + "@ngtools/webpack": "~7.0.0", + "@angular/compiler-cli": "~7.0.0", "@types/chai": "^4.0.2", "@types/mocha": "^2.2.41", "@types/node": "^7.0.5", diff --git a/e2e/single-page/package.json b/e2e/single-page/package.json index e87e182d3..7d1c6d35f 100644 --- a/e2e/single-page/package.json +++ b/e2e/single-page/package.json @@ -13,15 +13,15 @@ } }, "dependencies": { - "@angular/animations": "~7.0.0-rc.0", - "@angular/common": "~7.0.0-rc.0", - "@angular/compiler": "~7.0.0-rc.0", - "@angular/core": "~7.0.0-rc.0", - "@angular/forms": "~7.0.0-rc.0", - "@angular/http": "~7.0.0-rc.0", - "@angular/platform-browser": "~7.0.0-rc.0", - "@angular/platform-browser-dynamic": "~7.0.0-rc.0", - "@angular/router": "~7.0.0-rc.0", + "@angular/animations": "~7.0.0", + "@angular/common": "~7.0.0", + "@angular/compiler": "~7.0.0", + "@angular/core": "~7.0.0", + "@angular/forms": "~7.0.0", + "@angular/http": "~7.0.0", + "@angular/platform-browser": "~7.0.0", + "@angular/platform-browser-dynamic": "~7.0.0", + "@angular/router": "~7.0.0", "nativescript-angular": "file:../../nativescript-angular", "nativescript-intl": "^3.0.0", "reflect-metadata": "~0.1.8", @@ -30,7 +30,7 @@ "zone.js": "^0.8.4" }, "devDependencies": { - "@angular/compiler-cli": "~7.0.0-rc.0", + "@angular/compiler-cli": "~7.0.0", "@ngtools/webpack": "~6.2.0-beta.3", "@types/chai": "^4.0.2", "@types/mocha": "^2.2.41", diff --git a/nativescript-angular/package.json b/nativescript-angular/package.json index fdd72adb9..a813a01ee 100644 --- a/nativescript-angular/package.json +++ b/nativescript-angular/package.json @@ -44,30 +44,30 @@ "reflect-metadata": "^0.1.8" }, "peerDependencies": { - "@angular/platform-browser-dynamic": "~7.0.0-rc.0", - "@angular/common": "~7.0.0-rc.0", - "@angular/compiler": "~7.0.0-rc.0", - "@angular/core": "~7.0.0-rc.0", - "@angular/forms": "~7.0.0-rc.0", - "@angular/http": "~7.0.0-rc.0", - "@angular/platform-browser": "~7.0.0-rc.0", - "@angular/router": "~7.0.0-rc.0", + "@angular/platform-browser-dynamic": "~7.0.0", + "@angular/common": "~7.0.0", + "@angular/compiler": "~7.0.0", + "@angular/core": "~7.0.0", + "@angular/forms": "~7.0.0", + "@angular/http": "~7.0.0", + "@angular/platform-browser": "~7.0.0", + "@angular/router": "~7.0.0", "rxjs": "^6.0.0", "tns-core-modules": "^4.0.0 || >4.0.0- || >4.1.0-", "zone.js": "^0.8.26", "typescript": "~3.1.1" }, "devDependencies": { - "@angular/animations": "~7.0.0-rc.0", - "@angular/common": "~7.0.0-rc.0", - "@angular/compiler": "~7.0.0-rc.0", - "@angular/compiler-cli": "~7.0.0-rc.0", - "@angular/core": "~7.0.0-rc.0", - "@angular/forms": "~7.0.0-rc.0", - "@angular/http": "~7.0.0-rc.0", - "@angular/platform-browser": "~7.0.0-rc.0", - "@angular/platform-browser-dynamic": "~7.0.0-rc.0", - "@angular/router": "~7.0.0-rc.0", + "@angular/animations": "~7.0.0", + "@angular/common": "~7.0.0", + "@angular/compiler": "~7.0.0", + "@angular/compiler-cli": "~7.0.0", + "@angular/core": "~7.0.0", + "@angular/forms": "~7.0.0", + "@angular/http": "~7.0.0", + "@angular/platform-browser": "~7.0.0", + "@angular/platform-browser-dynamic": "~7.0.0", + "@angular/router": "~7.0.0", "codelyzer": "^4.3.0", "rxjs": "~6.3.3", "tns-core-modules": "next", diff --git a/tests/package.json b/tests/package.json index ade7fe807..a84031955 100644 --- a/tests/package.json +++ b/tests/package.json @@ -26,15 +26,15 @@ ], "homepage": "http://nativescript.org", "dependencies": { - "@angular/animations": "~7.0.0-rc.0", - "@angular/common": "~7.0.0-rc.0", - "@angular/compiler": "~7.0.0-rc.0", - "@angular/core": "~7.0.0-rc.0", - "@angular/forms": "~7.0.0-rc.0", - "@angular/http": "~7.0.0-rc.0", - "@angular/platform-browser": "~7.0.0-rc.0", - "@angular/platform-browser-dynamic": "~7.0.0-rc.0", - "@angular/router": "~7.0.0-rc.0", + "@angular/animations": "~7.0.0", + "@angular/common": "~7.0.0", + "@angular/compiler": "~7.0.0", + "@angular/core": "~7.0.0", + "@angular/forms": "~7.0.0", + "@angular/http": "~7.0.0", + "@angular/platform-browser": "~7.0.0", + "@angular/platform-browser-dynamic": "~7.0.0", + "@angular/router": "~7.0.0", "nativescript-angular": "../nativescript-angular", "nativescript-unit-test-runner": "^0.3.4", "rxjs": "~6.0.0-rc.1", From 70cf55d57115cb7af68f7680fe8090738d06f296 Mon Sep 17 00:00:00 2001 From: SvetoslavTsenov Date: Sat, 3 Nov 2018 13:07:14 +0200 Subject: [PATCH 5/5] chore: fix rxjs version --- e2e/modal-navigation-ng/package.json | 2 +- e2e/renderer/package.json | 2 +- e2e/router/package.json | 2 +- nativescript-angular/package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/e2e/modal-navigation-ng/package.json b/e2e/modal-navigation-ng/package.json index f603fb7b2..8938a8a85 100644 --- a/e2e/modal-navigation-ng/package.json +++ b/e2e/modal-navigation-ng/package.json @@ -25,7 +25,7 @@ "nativescript-angular": "file:../../nativescript-angular", "nativescript-theme-core": "~1.0.4", "reflect-metadata": "~0.1.8", - "rxjs": "~7.0.0", + "rxjs": "~6.3.3", "tns-core-modules": "next", "zone.js": "~0.8.2" }, diff --git a/e2e/renderer/package.json b/e2e/renderer/package.json index b6f43cecc..f003dd9ef 100644 --- a/e2e/renderer/package.json +++ b/e2e/renderer/package.json @@ -18,7 +18,7 @@ "nativescript-angular": "file:../../nativescript-angular", "nativescript-intl": "^3.0.0", "reflect-metadata": "~0.1.8", - "rxjs": "~7.0.0", + "rxjs": "~6.3.3", "tns-core-modules": "next", "zone.js": "^0.8.4" }, diff --git a/e2e/router/package.json b/e2e/router/package.json index 4cf4a98ad..3eefc28f8 100644 --- a/e2e/router/package.json +++ b/e2e/router/package.json @@ -19,7 +19,7 @@ "nativescript-angular": "file:../../nativescript-angular", "nativescript-intl": "^3.0.0", "reflect-metadata": "~0.1.8", - "rxjs": "~7.0.0", + "rxjs": "~6.3.3", "tns-core-modules": "next", "zone.js": "^0.8.26" }, diff --git a/nativescript-angular/package.json b/nativescript-angular/package.json index ea38177a9..426a82467 100644 --- a/nativescript-angular/package.json +++ b/nativescript-angular/package.json @@ -52,7 +52,7 @@ "@angular/http": "~7.0.0", "@angular/platform-browser": "~7.0.0", "@angular/router": "~7.0.0", - "rxjs": "^6.0.0", + "rxjs": "^6.3.3", "tns-core-modules": "^4.0.0 || >4.0.0- || >4.1.0-", "zone.js": "^0.8.26", "typescript": "~3.1.1"