Skip to content

Svetoslavtsenov/ng 7 tests #1584

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SvetoslavTsenov merged 8 commits into from
Nov 3, 2018
Merged

Svetoslavtsenov/ng 7 tests #1584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
df177f6
chore: bump versions to Angular 7.0-rc.0
sis0k0 Oct 4, 2018
26c5e16
chore: bump test apps deps
sis0k0 Oct 4, 2018
224867d
chore: include @angular/compiler-cli in the update script
sis0k0 Oct 4, 2018
fa3e674
Merge branch 'master' into sis0k0/ng-7
Oct 11, 2018
c703200
chore: update to the official Angular 7.0 :tada:
sis0k0 Oct 18, 2018
362e94c
Merge branch 'master' into sis0k0/ng-7
SvetoslavTsenov Oct 26, 2018
e16391c
Merge branch 'master' into sis0k0/ng-7
SvetoslavTsenov Nov 1, 2018
70cf55d
chore: fix rxjs version
SvetoslavTsenov Nov 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions e2e/modal-navigation-ng/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
"@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": "~6.1.0",
"rxjs": "~6.3.3",
"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",
"@angular/compiler-cli": "~7.0.0",
"@types/chai": "^4.0.2",
"@types/mocha": "^2.2.41",
"@types/node": "^7.0.5",
Expand All @@ -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",
Expand Down
24 changes: 12 additions & 12 deletions e2e/renderer/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
"@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": "~6.1.0",
"rxjs": "~6.3.3",
"tns-core-modules": "next",
"zone.js": "^0.8.4"
},
"devDependencies": {
"@angular/compiler-cli": "~6.1.0",
"@angular/compiler-cli": "~7.0.0",
"@types/chai": "^4.0.2",
"@types/mocha": "^2.2.41",
"@types/node": "^7.0.5",
Expand All @@ -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"
},
"scripts": {
"e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json",
Expand Down
20 changes: 10 additions & 10 deletions e2e/router-tab-view/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
"@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",
Expand All @@ -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",
Expand Down
26 changes: 13 additions & 13 deletions e2e/router/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
"@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": "~6.1.0",
"rxjs": "~6.3.3",
"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",
"@angular/compiler-cli": "~7.0.0",
"@types/chai": "^4.0.2",
"@types/mocha": "^2.2.41",
"@types/node": "^7.0.5",
Expand All @@ -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",
Expand Down
22 changes: 11 additions & 11 deletions e2e/single-page/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
"@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",
Expand All @@ -30,7 +30,7 @@
"zone.js": "^0.8.4"
},
"devDependencies": {
"@angular/compiler-cli": "~6.1.0",
"@angular/compiler-cli": "~7.0.0",
"@ngtools/webpack": "~6.2.0-beta.3",
"@types/chai": "^4.0.2",
"@types/mocha": "^2.2.41",
Expand All @@ -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",
Expand Down
9 changes: 7 additions & 2 deletions nativescript-angular/bin/update-app-ng-deps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

Expand Down
44 changes: 22 additions & 22 deletions nativescript-angular/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
"rxjs": "^6.0.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.3.3",
"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",
"@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.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"
}
}
20 changes: 10 additions & 10 deletions tests/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
"@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",
Expand All @@ -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",
Expand Down