diff --git a/CHANGELOG.md b/CHANGELOG.md index 249f9800d..519cfee07 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,22 @@ + +# [8.2.0](https://github.com/NativeScript/nativescript-angular/compare/8.1.0...8.2.0) (2019-08-13) + + +### Features + +* Update to Angular 8.2.x ([dbe983b](https://github.com/NativeScript/nativescript-angular/commit/dbe983b)) +* Remove `@angular/http` from the dependecies ([#1842](https://github.com/NativeScript/nativescript-angular/issues/1842)) ([c6af21d](https://github.com/NativeScript/nativescript-angular/commit/c6af21d)) + +### BREAKING CHANGES: + +* The `NativeScriptHttpModule` is removed +* `@angular/http` is removed from the dependencies + +Migration steps: +* If using `NativeScriptHttpModule`, replace with `NativeScriptHttpClientModule` as done [here](https://github.com/NativeScript/nativescript-sdk-examples-ng/commit/16d3caee2b0ee2d88d328b75bde49eea6c96920a) +* as `@angular/http` is no longer a peerDependency of `nativescript-angular`, you can remove if from your dependencies + + # [8.1.0](https://github.com/NativeScript/nativescript-angular/compare/8.0.3...8.1.0) (2019-07-31) diff --git a/e2e/animation-examples/app/vendor.ts b/e2e/animation-examples/app/vendor.ts index fd29170f2..3dceebdfa 100644 --- a/e2e/animation-examples/app/vendor.ts +++ b/e2e/animation-examples/app/vendor.ts @@ -10,7 +10,6 @@ require("@angular/platform-browser"); require("@angular/core"); require("@angular/common"); require("@angular/forms"); -require("@angular/http"); require("@angular/router"); require("nativescript-angular/platform-static"); diff --git a/e2e/animation-examples/e2e/resources/images/ng4animations/Emulator-Api29-Google/add_active_items.png b/e2e/animation-examples/e2e/resources/images/ng4animations/Emulator-Api29-Google/add_active_items.png new file mode 100644 index 000000000..b39b8fa55 Binary files /dev/null and b/e2e/animation-examples/e2e/resources/images/ng4animations/Emulator-Api29-Google/add_active_items.png differ diff --git a/e2e/animation-examples/e2e/resources/images/ng4animations/Emulator-Api29-Google/add_inactive_items.png b/e2e/animation-examples/e2e/resources/images/ng4animations/Emulator-Api29-Google/add_inactive_items.png new file mode 100644 index 000000000..69326e20d Binary files /dev/null and b/e2e/animation-examples/e2e/resources/images/ng4animations/Emulator-Api29-Google/add_inactive_items.png differ diff --git a/e2e/animation-examples/e2e/resources/images/ng4animations/Emulator-Api29-Google/add_remove_items.png b/e2e/animation-examples/e2e/resources/images/ng4animations/Emulator-Api29-Google/add_remove_items.png new file mode 100644 index 000000000..b39b8fa55 Binary files /dev/null and b/e2e/animation-examples/e2e/resources/images/ng4animations/Emulator-Api29-Google/add_remove_items.png differ diff --git a/e2e/animation-examples/e2e/resources/images/ng4animations/Emulator-Api29-Google/add_reset_items.png b/e2e/animation-examples/e2e/resources/images/ng4animations/Emulator-Api29-Google/add_reset_items.png new file mode 100644 index 000000000..255c1c881 Binary files /dev/null and b/e2e/animation-examples/e2e/resources/images/ng4animations/Emulator-Api29-Google/add_reset_items.png differ diff --git a/e2e/animation-examples/package.json b/e2e/animation-examples/package.json index 77e986b43..8a6bbc7bc 100644 --- a/e2e/animation-examples/package.json +++ b/e2e/animation-examples/package.json @@ -13,25 +13,24 @@ } }, "dependencies": { - "@angular/animations": "~8.1.0", - "@angular/common": "~8.1.0", - "@angular/compiler": "~8.1.0", - "@angular/core": "~8.1.0", - "@angular/forms": "~8.1.0", - "@angular/http": "8.0.0-beta.10", - "@angular/platform-browser": "~8.1.0", - "@angular/platform-browser-dynamic": "~8.1.0", - "@angular/router": "~8.1.0", + "@angular/animations": "~8.2.0", + "@angular/common": "~8.2.0", + "@angular/compiler": "~8.2.0", + "@angular/core": "~8.2.0", + "@angular/forms": "~8.2.0", + "@angular/platform-browser": "~8.2.0", + "@angular/platform-browser-dynamic": "~8.2.0", + "@angular/router": "~8.2.0", "nativescript-angular": "file:../../nativescript-angular", "nativescript-theme-core": "~1.0.2", "reflect-metadata": "~0.1.8", - "rxjs": "^6.3.3", + "rxjs": "^6.4.0", "tns-core-modules": "next", "zone.js": "^0.9.1" }, "devDependencies": { - "@angular/compiler-cli": "~8.1.0", - "@ngtools/webpack": "~8.1.0", + "@angular/compiler-cli": "~8.2.0", + "@ngtools/webpack": "~8.2.0", "@types/chai": "~4.1.7", "@types/mocha": "~5.2.5", "@types/node": "~10.12.18", @@ -44,7 +43,7 @@ "nativescript-css-loader": "~0.26.0", "nativescript-dev-appium": "^5.3.0", "nativescript-dev-webpack": "next", - "typescript": "~3.4.5" + "typescript": "~3.5.3" }, "scripts": { "u": "update-ns-webpack", diff --git a/e2e/config/appium.capabilities.json b/e2e/config/appium.capabilities.json index 62ffb633d..6c4b96c77 100644 --- a/e2e/config/appium.capabilities.json +++ b/e2e/config/appium.capabilities.json @@ -106,6 +106,16 @@ "noReset": true, "fullReset": false }, + "android29": { + "platformName": "Android", + "platformVersion": "29", + "deviceName": "Emulator-Api29-Google", + "avd": "Emulator-Api29-Google", + "lt": 60000, + "newCommandTimeout": 720, + "noReset": true, + "fullReset": false + }, "sim.iPhone7.iOS100": { "platformName": "iOS", "platformVersion": "10.0", diff --git a/e2e/modal-navigation-ng/package.json b/e2e/modal-navigation-ng/package.json index 5d5ad6d0c..90ed2666d 100644 --- a/e2e/modal-navigation-ng/package.json +++ b/e2e/modal-navigation-ng/package.json @@ -4,28 +4,33 @@ "readme": "NativeScript Application", "repository": "", "nativescript": { - "id": "org.nativescript.modalnavigationng" + "id": "org.nativescript.modalnavigationng", + "tns-ios": { + "version": "6.0.2" + }, + "tns-android": { + "version": "6.0.1" + } }, "dependencies": { - "@angular/animations": "~8.1.0", - "@angular/common": "~8.1.0", - "@angular/compiler": "~8.1.0", - "@angular/core": "~8.1.0", - "@angular/forms": "~8.1.0", - "@angular/http": "8.0.0-beta.10", - "@angular/platform-browser": "~8.1.0", - "@angular/platform-browser-dynamic": "~8.1.0", - "@angular/router": "~8.1.0", + "@angular/animations": "~8.2.0", + "@angular/common": "~8.2.0", + "@angular/compiler": "~8.2.0", + "@angular/core": "~8.2.0", + "@angular/forms": "~8.2.0", + "@angular/platform-browser": "~8.2.0", + "@angular/platform-browser-dynamic": "~8.2.0", + "@angular/router": "~8.2.0", "nativescript-angular": "file:../../nativescript-angular", "nativescript-theme-core": "~1.0.4", "reflect-metadata": "~0.1.8", - "rxjs": "~6.3.3", + "rxjs": "^6.4.0", "tns-core-modules": "next", "zone.js": "^0.9.1" }, "devDependencies": { - "@angular/compiler-cli": "~8.1.0", - "@ngtools/webpack": "~8.1.0", + "@angular/compiler-cli": "~8.2.0", + "@ngtools/webpack": "~8.2.0", "@types/chai": "~4.1.7", "@types/mocha": "~5.2.5", "@types/node": "~10.12.18", @@ -38,7 +43,7 @@ "nativescript-dev-appium": "^5.3.0", "nativescript-dev-webpack": "next", "tns-platform-declarations": "next", - "typescript": "~3.4.5" + "typescript": "~3.5.3" }, "scripts": { "e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json", diff --git a/e2e/nested-router-tab-view/package.json b/e2e/nested-router-tab-view/package.json index 8ae2279dc..89fd27d65 100644 --- a/e2e/nested-router-tab-view/package.json +++ b/e2e/nested-router-tab-view/package.json @@ -7,25 +7,24 @@ "id": "org.nativescript.nestedroutertabview" }, "dependencies": { - "@angular/animations": "~8.1.0", - "@angular/common": "~8.1.0", - "@angular/compiler": "~8.1.0", - "@angular/core": "~8.1.0", - "@angular/forms": "~8.1.0", - "@angular/http": "8.0.0-beta.10", - "@angular/platform-browser": "~8.1.0", - "@angular/platform-browser-dynamic": "~8.1.0", - "@angular/router": "~8.1.0", + "@angular/animations": "~8.2.0", + "@angular/common": "~8.2.0", + "@angular/compiler": "~8.2.0", + "@angular/core": "~8.2.0", + "@angular/forms": "~8.2.0", + "@angular/platform-browser": "~8.2.0", + "@angular/platform-browser-dynamic": "~8.2.0", + "@angular/router": "~8.2.0", "nativescript-angular": "file:../../nativescript-angular", "nativescript-theme-core": "~1.0.4", "reflect-metadata": "~0.1.8", - "rxjs": "~6.3.3", + "rxjs": "^6.4.0", "tns-core-modules": "next", "zone.js": "^0.9.1" }, "devDependencies": { - "@angular/compiler-cli": "~8.1.0", - "@ngtools/webpack": "~8.1.0", + "@angular/compiler-cli": "~8.2.0", + "@ngtools/webpack": "~8.2.0", "@types/chai": "~4.1.7", "@types/mocha": "~5.2.5", "@types/node": "~10.12.18", @@ -37,7 +36,7 @@ "mochawesome": "~3.1.2", "nativescript-dev-appium": "^5.3.0", "nativescript-dev-webpack": "next", - "typescript": "3.4.5" + "typescript": "~3.5.3" }, "scripts": { "e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json", diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/actionBarVisibility-always-default.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/actionBarVisibility-always-default.png index bc0d1a05f..b8deed4a0 100644 Binary files a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/actionBarVisibility-always-default.png and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/actionBarVisibility-always-default.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/actionBarVisibility-always-hidden.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/actionBarVisibility-always-hidden.png index bc0d1a05f..b8deed4a0 100644 Binary files a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/actionBarVisibility-always-hidden.png and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/actionBarVisibility-always-hidden.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/actionBarVisibility-always-shown.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/actionBarVisibility-always-shown.png index bc0d1a05f..8cf735126 100644 Binary files a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/actionBarVisibility-always-shown.png and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/actionBarVisibility-always-shown.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/actionBarVisibility-auto-default.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/actionBarVisibility-auto-default.png index 35f7b558f..6d616d8fb 100644 Binary files a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/actionBarVisibility-auto-default.png and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/actionBarVisibility-auto-default.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/actionBarVisibility-auto-hidden.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/actionBarVisibility-auto-hidden.png index 35f7b558f..410dcb8c3 100644 Binary files a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/actionBarVisibility-auto-hidden.png and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/actionBarVisibility-auto-hidden.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/actionBarVisibility-auto-shown.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/actionBarVisibility-auto-shown.png index e9d1bf64a..6c4ad9dea 100644 Binary files a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/actionBarVisibility-auto-shown.png and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/actionBarVisibility-auto-shown.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/actionBarVisibility-never-default.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/actionBarVisibility-never-default.png index 3559eb226..1bbd6b2e1 100644 Binary files a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/actionBarVisibility-never-default.png and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/actionBarVisibility-never-default.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/actionBarVisibility-never-hidden.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/actionBarVisibility-never-hidden.png index 1af63885d..cadcf67b6 100644 Binary files a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/actionBarVisibility-never-hidden.png and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/actionBarVisibility-never-hidden.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/actionBarVisibility-never-shown.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/actionBarVisibility-never-shown.png index 3559eb226..cadcf67b6 100644 Binary files a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/actionBarVisibility-never-shown.png and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/actionBarVisibility-never-shown.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/tab-view-binding-first-tab.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/tab-view-binding-first-tab.png index 485cdec79..2a6479be2 100644 Binary files a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/tab-view-binding-first-tab.png and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/tab-view-binding-first-tab.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/tab-view-binding-second-tab.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/tab-view-binding-second-tab.png index a5738294d..d5a33e4d4 100644 Binary files a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/tab-view-binding-second-tab.png and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/tab-view-binding-second-tab.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/tab-view-binding-third-tab.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/tab-view-binding-third-tab.png index c5f16603a..4432ba921 100644 Binary files a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/tab-view-binding-third-tab.png and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api28-Google/tab-view-binding-third-tab.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api29-Google/actionBarVisibility-always-default.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api29-Google/actionBarVisibility-always-default.png new file mode 100644 index 000000000..6fcbd1b78 Binary files /dev/null and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api29-Google/actionBarVisibility-always-default.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api29-Google/actionBarVisibility-always-hidden.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api29-Google/actionBarVisibility-always-hidden.png new file mode 100644 index 000000000..6fcbd1b78 Binary files /dev/null and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api29-Google/actionBarVisibility-always-hidden.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api29-Google/actionBarVisibility-always-shown.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api29-Google/actionBarVisibility-always-shown.png new file mode 100644 index 000000000..6fcbd1b78 Binary files /dev/null and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api29-Google/actionBarVisibility-always-shown.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api29-Google/actionBarVisibility-auto-default.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api29-Google/actionBarVisibility-auto-default.png new file mode 100644 index 000000000..9ac141c2f Binary files /dev/null and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api29-Google/actionBarVisibility-auto-default.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api29-Google/actionBarVisibility-auto-hidden.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api29-Google/actionBarVisibility-auto-hidden.png new file mode 100644 index 000000000..9ac141c2f Binary files /dev/null and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api29-Google/actionBarVisibility-auto-hidden.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api29-Google/actionBarVisibility-auto-shown.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api29-Google/actionBarVisibility-auto-shown.png new file mode 100644 index 000000000..bee8777f6 Binary files /dev/null and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api29-Google/actionBarVisibility-auto-shown.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api29-Google/actionBarVisibility-never-default.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api29-Google/actionBarVisibility-never-default.png new file mode 100644 index 000000000..1f80e5739 Binary files /dev/null and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api29-Google/actionBarVisibility-never-default.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api29-Google/actionBarVisibility-never-hidden.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api29-Google/actionBarVisibility-never-hidden.png new file mode 100644 index 000000000..1f80e5739 Binary files /dev/null and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api29-Google/actionBarVisibility-never-hidden.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api29-Google/actionBarVisibility-never-shown.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api29-Google/actionBarVisibility-never-shown.png new file mode 100644 index 000000000..1f80e5739 Binary files /dev/null and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api29-Google/actionBarVisibility-never-shown.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api29-Google/tab-view-binding-first-tab.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api29-Google/tab-view-binding-first-tab.png new file mode 100644 index 000000000..f59d65640 Binary files /dev/null and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api29-Google/tab-view-binding-first-tab.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api29-Google/tab-view-binding-second-tab.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api29-Google/tab-view-binding-second-tab.png new file mode 100644 index 000000000..a60bc2cf2 Binary files /dev/null and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api29-Google/tab-view-binding-second-tab.png differ diff --git a/e2e/renderer/e2e/resources/images/renderer/Emulator-Api29-Google/tab-view-binding-third-tab.png b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api29-Google/tab-view-binding-third-tab.png new file mode 100644 index 000000000..559e2567c Binary files /dev/null and b/e2e/renderer/e2e/resources/images/renderer/Emulator-Api29-Google/tab-view-binding-third-tab.png differ diff --git a/e2e/renderer/package.json b/e2e/renderer/package.json index 04af019b8..d59b354b6 100644 --- a/e2e/renderer/package.json +++ b/e2e/renderer/package.json @@ -7,24 +7,23 @@ "id": "org.nativescript.renderer" }, "dependencies": { - "@angular/common": "~8.1.0", - "@angular/compiler": "~8.1.0", - "@angular/core": "~8.1.0", - "@angular/forms": "~8.1.0", - "@angular/http": "8.0.0-beta.10", - "@angular/platform-browser": "~8.1.0", - "@angular/platform-browser-dynamic": "~8.1.0", - "@angular/router": "~8.1.0", + "@angular/common": "~8.2.0", + "@angular/compiler": "~8.2.0", + "@angular/core": "~8.2.0", + "@angular/forms": "~8.2.0", + "@angular/platform-browser": "~8.2.0", + "@angular/platform-browser-dynamic": "~8.2.0", + "@angular/router": "~8.2.0", "nativescript-angular": "file:../../nativescript-angular", "nativescript-intl": "^3.0.0", "reflect-metadata": "~0.1.8", - "rxjs": "~6.3.3", + "rxjs": "^6.4.0", "tns-core-modules": "next", "zone.js": "^0.9.1" }, "devDependencies": { - "@angular/compiler-cli": "~8.1.0", - "@ngtools/webpack": "~8.1.0", + "@angular/compiler-cli": "~8.2.0", + "@ngtools/webpack": "~8.2.0", "@types/chai": "~4.1.7", "@types/mocha": "~5.2.5", "@types/node": "~10.12.18", @@ -39,7 +38,7 @@ "nativescript-dev-appium": "^5.3.0", "nativescript-dev-webpack": "next", "tslib": "^1.7.1", - "typescript": "~3.4.5" + "typescript": "~3.5.3" }, "scripts": { "e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json", diff --git a/e2e/routable-animations/e2e/resources/images/nsroanimations/Emulator-Api29-Google/home.png b/e2e/routable-animations/e2e/resources/images/nsroanimations/Emulator-Api29-Google/home.png new file mode 100644 index 000000000..84c471736 Binary files /dev/null and b/e2e/routable-animations/e2e/resources/images/nsroanimations/Emulator-Api29-Google/home.png differ diff --git a/e2e/routable-animations/e2e/resources/images/nsroanimations/Emulator-Api29-Google/support.png b/e2e/routable-animations/e2e/resources/images/nsroanimations/Emulator-Api29-Google/support.png new file mode 100644 index 000000000..4119e217b Binary files /dev/null and b/e2e/routable-animations/e2e/resources/images/nsroanimations/Emulator-Api29-Google/support.png differ diff --git a/e2e/routable-animations/e2e/resources/images/nsroanimations/iPhone 7 12/support.png b/e2e/routable-animations/e2e/resources/images/nsroanimations/iPhone 7 12/support.png index 37ed5d73d..aaf591a50 100644 Binary files a/e2e/routable-animations/e2e/resources/images/nsroanimations/iPhone 7 12/support.png and b/e2e/routable-animations/e2e/resources/images/nsroanimations/iPhone 7 12/support.png differ diff --git a/e2e/routable-animations/package.json b/e2e/routable-animations/package.json index a2982c286..c3b47a425 100644 --- a/e2e/routable-animations/package.json +++ b/e2e/routable-animations/package.json @@ -7,25 +7,24 @@ "id": "org.nativescript.nsroanimations" }, "dependencies": { - "@angular/animations": "~8.1.0", - "@angular/common": "~8.1.0", - "@angular/compiler": "~8.1.0", - "@angular/core": "~8.1.0", - "@angular/forms": "~8.1.0", - "@angular/http": "8.0.0-beta.10", - "@angular/platform-browser": "~8.1.0", - "@angular/platform-browser-dynamic": "~8.1.0", - "@angular/router": "~8.1.0", + "@angular/animations": "~8.2.0", + "@angular/common": "~8.2.0", + "@angular/compiler": "~8.2.0", + "@angular/core": "~8.2.0", + "@angular/forms": "~8.2.0", + "@angular/platform-browser": "~8.2.0", + "@angular/platform-browser-dynamic": "~8.2.0", + "@angular/router": "~8.2.0", "nativescript-angular": "next", "nativescript-theme-core": "~1.0.2", "reflect-metadata": "~0.1.8", - "rxjs": "~6.0.0 || >=6.1.0", + "rxjs": "^6.4.0", "tns-core-modules": "next", "zone.js": "^0.9.1" }, "devDependencies": { - "@ngtools/webpack": "~8.1.0", - "@angular/compiler-cli": "~8.1.0", + "@ngtools/webpack": "~8.2.0", + "@angular/compiler-cli": "~8.2.0", "@types/chai": "~4.1.3", "@types/mocha": "~5.2.1", "@types/node": "^7.0.5", @@ -37,7 +36,7 @@ "nativescript-css-loader": "~0.26.0", "nativescript-dev-appium": "^5.3.0", "nativescript-dev-webpack": "next", - "typescript": "~3.4.5" + "typescript": "~3.5.3" }, "scripts": { "ns-bundle": "ns-bundle", diff --git a/e2e/router-tab-view/package.json b/e2e/router-tab-view/package.json index 40146d0e8..523805087 100644 --- a/e2e/router-tab-view/package.json +++ b/e2e/router-tab-view/package.json @@ -7,20 +7,19 @@ "id": "org.nativescript.routertabview" }, "dependencies": { - "@angular/animations": "~8.1.0", - "@angular/common": "~8.1.0", - "@angular/compiler": "~8.1.0", - "@angular/core": "~8.1.0", - "@angular/forms": "~8.1.0", - "@angular/http": "8.0.0-beta.10", - "@angular/platform-browser": "~8.1.0", - "@angular/platform-browser-dynamic": "~8.1.0", - "@angular/router": "~8.1.0", + "@angular/animations": "~8.2.0", + "@angular/common": "~8.2.0", + "@angular/compiler": "~8.2.0", + "@angular/core": "~8.2.0", + "@angular/forms": "~8.2.0", + "@angular/platform-browser": "~8.2.0", + "@angular/platform-browser-dynamic": "~8.2.0", + "@angular/router": "~8.2.0", "nativescript-angular": "file:../../nativescript-angular", "nativescript-dev-webpack": "next", "nativescript-theme-core": "~1.0.4", "reflect-metadata": "~0.1.8", - "rxjs": "~6.3.3", + "rxjs": "^6.4.0", "tns-core-modules": "next", "zone.js": "^0.9.1" }, @@ -35,7 +34,7 @@ "mocha": "~5.2.0", "mochawesome": "~3.1.2", "nativescript-dev-appium": "^5.3.0", - "typescript": "~3.4.5", + "typescript": "~3.5.3", "@angular/compiler-cli": "8.0.0", "@ngtools/webpack": "8.0.0" }, diff --git a/e2e/router/package.json b/e2e/router/package.json index 74eb9aaef..7b8954b3e 100644 --- a/e2e/router/package.json +++ b/e2e/router/package.json @@ -7,25 +7,24 @@ "id": "org.nativescript.router" }, "dependencies": { - "@angular/animations": "~8.1.0", - "@angular/common": "~8.1.0", - "@angular/compiler": "~8.1.0", - "@angular/core": "~8.1.0", - "@angular/forms": "~8.1.0", - "@angular/http": "8.0.0-beta.10", - "@angular/platform-browser": "~8.1.0", - "@angular/platform-browser-dynamic": "~8.1.0", - "@angular/router": "~8.1.0", + "@angular/animations": "~8.2.0", + "@angular/common": "~8.2.0", + "@angular/compiler": "~8.2.0", + "@angular/core": "~8.2.0", + "@angular/forms": "~8.2.0", + "@angular/platform-browser": "~8.2.0", + "@angular/platform-browser-dynamic": "~8.2.0", + "@angular/router": "~8.2.0", "nativescript-angular": "file:../../nativescript-angular", "nativescript-intl": "^3.0.0", "reflect-metadata": "~0.1.8", - "rxjs": "~6.3.3", + "rxjs": "^6.4.0", "tns-core-modules": "next", "zone.js": "^0.9.1" }, "devDependencies": { - "@angular/compiler-cli": "~8.1.0", - "@ngtools/webpack": "~8.1.0", + "@angular/compiler-cli": "~8.2.0", + "@ngtools/webpack": "~8.2.0", "@types/chai": "~4.1.7", "@types/mocha": "~5.2.5", "@types/node": "^10.12.12", @@ -40,7 +39,7 @@ "nativescript-dev-appium": "^5.3.0", "nativescript-dev-webpack": "next", "tslib": "^1.7.1", - "typescript": "~3.4.5" + "typescript": "~3.5.3" }, "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 e49055e60..909e79e36 100644 --- a/e2e/single-page/package.json +++ b/e2e/single-page/package.json @@ -7,25 +7,24 @@ "id": "org.nativescript.singlepage" }, "dependencies": { - "@angular/animations": "~8.1.0", - "@angular/common": "~8.1.0", - "@angular/compiler": "~8.1.0", - "@angular/core": "~8.1.0", - "@angular/forms": "~8.1.0", - "@angular/http": "8.0.0-beta.10", - "@angular/platform-browser": "~8.1.0", - "@angular/platform-browser-dynamic": "~8.1.0", - "@angular/router": "~8.1.0", + "@angular/animations": "~8.2.0", + "@angular/common": "~8.2.0", + "@angular/compiler": "~8.2.0", + "@angular/core": "~8.2.0", + "@angular/forms": "~8.2.0", + "@angular/platform-browser": "~8.2.0", + "@angular/platform-browser-dynamic": "~8.2.0", + "@angular/router": "~8.2.0", "nativescript-angular": "file:../../nativescript-angular", "nativescript-intl": "^3.0.0", "reflect-metadata": "~0.1.8", - "rxjs": "~6.3.3", + "rxjs": "^6.4.0", "tns-core-modules": "next", "zone.js": "^0.9.1" }, "devDependencies": { - "@angular/compiler-cli": "~8.1.0", - "@ngtools/webpack": "~8.1.0", + "@angular/compiler-cli": "~8.2.0", + "@ngtools/webpack": "~8.2.0", "@types/chai": "~4.1.7", "@types/mocha": "~5.2.5", "@types/node": "~10.12.18", @@ -40,7 +39,7 @@ "nativescript-dev-appium": "^5.3.0", "nativescript-dev-webpack": "next", "tslib": "^1.7.1", - "typescript": "~3.4.5" + "typescript": "~3.5.3" }, "scripts": { "e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json", diff --git a/e2e/tests-app-ng/package.json b/e2e/tests-app-ng/package.json index 73f1379bd..a4935f365 100644 --- a/e2e/tests-app-ng/package.json +++ b/e2e/tests-app-ng/package.json @@ -7,18 +7,18 @@ "id": "org.nativescript.testsappng" }, "dependencies": { - "@angular/common": "~8.1.0", - "@angular/compiler": "~8.1.0", - "@angular/core": "~8.1.0", - "@angular/forms": "~8.1.0", - "@angular/platform-browser": "~8.1.0", - "@angular/platform-browser-dynamic": "~8.1.0", - "@angular/router": "~8.1.0", + "@angular/common": "~8.2.0", + "@angular/compiler": "~8.2.0", + "@angular/core": "~8.2.0", + "@angular/forms": "~8.2.0", + "@angular/platform-browser": "~8.2.0", + "@angular/platform-browser-dynamic": "~8.2.0", + "@angular/router": "~8.2.0", "nativescript-angular": "next", "nativescript-intl": "~3.0.0", "nativescript-theme-core": "^1.0.4", "reflect-metadata": "~0.1.8", - "rxjs": "~6.0.0 || >=6.1.0 || >=6.0.0", + "rxjs": "^6.4.0", "tns-core-modules": "next", "zone.js": "^0.9.1" }, @@ -26,12 +26,12 @@ "babel-traverse": "6.24.1", "babel-types": "6.24.1", "babylon": "6.17.0", - "codelyzer": "^4.0.0", + "codelyzer": "^5.1.0", "filewalker": "^0.1.3", "lazy": "1.0.11", "nativescript-dev-webpack": "next", "tslint": "^5.4.3", - "typescript": "~3.4.5", + "typescript": "~3.5.3", "@angular/compiler-cli": "~8.0.0", "@ngtools/webpack": "~8.0.0" }, diff --git a/nativescript-angular/http/http.module.ts b/nativescript-angular/http/http.module.ts deleted file mode 100644 index b6d35172c..000000000 --- a/nativescript-angular/http/http.module.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { NgModule } from "@angular/core"; -import { Http, XHRBackend, RequestOptions, HttpModule, XSRFStrategy } from "@angular/http"; - -import { NSXSRFStrategy, NSHttp } from "./ns-http"; -import { NSFileSystem } from "../file-system/ns-file-system"; - -export { NSHttp } from "./ns-http"; - -export function nsHttpFactory(backend, options, nsFileSystem) { - return new NSHttp(backend, options, nsFileSystem); -} - -export function nsXSRFStrategyFactory() { - return new NSXSRFStrategy(); -} - -@NgModule({ - providers: [ - { provide: XSRFStrategy, useFactory: nsXSRFStrategyFactory }, - NSFileSystem, - { - provide: Http, useFactory: nsHttpFactory, - deps: [XHRBackend, RequestOptions, NSFileSystem] - } - ], - imports: [ - HttpModule, - ], - exports: [ - HttpModule, - ] -}) -export class NativeScriptHttpModule { -} diff --git a/nativescript-angular/http/index.ts b/nativescript-angular/http/index.ts deleted file mode 100644 index 720657322..000000000 --- a/nativescript-angular/http/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from "./http.module"; diff --git a/nativescript-angular/http/ns-http.ts b/nativescript-angular/http/ns-http.ts deleted file mode 100644 index 5d609473e..000000000 --- a/nativescript-angular/http/ns-http.ts +++ /dev/null @@ -1,71 +0,0 @@ -import { Injectable } from "@angular/core"; -import { - Http, - ConnectionBackend, - Request, - RequestOptions, - RequestOptionsArgs, - ResponseOptions, - ResponseType, - Response -} from "@angular/http"; -import { Observable } from "rxjs"; - -import { isLocalRequest, processLocalFileRequest } from "../http-client/http-utils"; - -import { NSFileSystem } from "../file-system/ns-file-system"; - -export class NSXSRFStrategy { - public configureRequest(_req: any) { - // noop - } -} - -@Injectable() -export class NSHttp extends Http { - constructor(backend: ConnectionBackend, defaultOptions: RequestOptions, private nsFileSystem: NSFileSystem) { - super(backend, defaultOptions); - } - - /** - * Performs a request with `request` http method. - */ - request(req: string | Request, options?: RequestOptionsArgs): Observable { - const urlString = typeof req === "string" ? req : req.url; - if (isLocalRequest(urlString)) { - return this.requestLocalFile(urlString); - } else { - return super.request(req, options); - } - } - - /** - * Performs a request with `get` http method. - */ - get(url: string, options?: RequestOptionsArgs): Observable { - if (isLocalRequest(url)) { - return this.requestLocalFile(url); - } else { - return super.get(url, options); - } - } - - private requestLocalFile(url: string): Observable { - return processLocalFileRequest( - url, - this.nsFileSystem, - createResponse, - createResponse - ); - } -} - -function createResponse(url: string, body: string | Object, status: number): Response { - return new Response(new ResponseOptions({ - body: body, - status: status, - statusText: "OK", - type: status === 200 ? ResponseType.Default : ResponseType.Error, - url: url - })); -} diff --git a/nativescript-angular/index.ts b/nativescript-angular/index.ts index e5f4bfb8b..db3cb4279 100644 --- a/nativescript-angular/index.ts +++ b/nativescript-angular/index.ts @@ -5,7 +5,6 @@ export * from "./platform"; export * from "./platform-static"; export * from "./router"; export * from "./forms"; -export * from "./http"; export * from "./directives"; export * from "./common/detached-loader"; export * from "./trace"; diff --git a/nativescript-angular/package.json b/nativescript-angular/package.json index f1d55a1e1..c82578388 100644 --- a/nativescript-angular/package.json +++ b/nativescript-angular/package.json @@ -1,6 +1,6 @@ { "name": "nativescript-angular", - "version": "8.1.0", + "version": "8.2.0", "description": "An Angular renderer that lets you build mobile apps with NativeScript.", "homepage": "https://www.nativescript.org/", "bugs": "https://github.com/NativeScript/nativescript-angular/issues", @@ -45,36 +45,34 @@ "reflect-metadata": "^0.1.8" }, "peerDependencies": { - "@angular/platform-browser-dynamic": "~8.1.0", - "@angular/common": "~8.1.0", - "@angular/compiler": "~8.1.0", - "@angular/core": "~8.1.0", - "@angular/forms": "~8.1.0", - "@angular/http": "8.0.0-beta.10", - "@angular/platform-browser": "~8.1.0", - "@angular/router": "~8.1.0", - "rxjs": "^6.3.3", + "@angular/platform-browser-dynamic": "~8.2.0", + "@angular/common": "~8.2.0", + "@angular/compiler": "~8.2.0", + "@angular/core": "~8.2.0", + "@angular/forms": "~8.2.0", + "@angular/platform-browser": "~8.2.0", + "@angular/router": "~8.2.0", + "rxjs": "^6.4.0", "tns-core-modules": "^6.0.0 || >6.1.0-", - "typescript": "~3.4.5", + "typescript": "~3.5.3", "zone.js": "^0.9.1" }, "devDependencies": { - "@angular/animations": "~8.1.0", - "@angular/common": "~8.1.0", - "@angular/compiler": "~8.1.0", - "@angular/compiler-cli": "~8.1.0", - "@angular/core": "~8.1.0", - "@angular/forms": "~8.1.0", - "@angular/http": "8.0.0-beta.10", - "@angular/platform-browser": "~8.1.0", - "@angular/platform-browser-dynamic": "~8.1.0", - "@angular/router": "~8.1.0", - "codelyzer": "^4.5.0", + "@angular/animations": "~8.2.0", + "@angular/common": "~8.2.0", + "@angular/compiler": "~8.2.0", + "@angular/compiler-cli": "~8.2.0", + "@angular/core": "~8.2.0", + "@angular/forms": "~8.2.0", + "@angular/platform-browser": "~8.2.0", + "@angular/platform-browser-dynamic": "~8.2.0", + "@angular/router": "~8.2.0", + "codelyzer": "^5.1.0", "conventional-changelog-cli": "^1.3.22", - "rxjs": "~6.3.3", + "rxjs": "^6.4.0", "tns-core-modules": "next", "tslint": "^5.5.0", - "typescript": "~3.4.5", + "typescript": "~3.5.3", "zone.js": "^0.9.1", "nativescript-typedoc-theme": "git://github.com/NativeScript/nativescript-typedoc-theme.git#master", "typedoc": "^0.13.0" diff --git a/nativescript-angular/tsconfig.typedoc.json b/nativescript-angular/tsconfig.typedoc.json index 3074c04b8..e6cbd184d 100644 --- a/nativescript-angular/tsconfig.typedoc.json +++ b/nativescript-angular/tsconfig.typedoc.json @@ -53,7 +53,6 @@ "./router/private-imports", "./schema-registry.ts", "./http-client/index.ts", - "./http/index.ts", "./router/index.ts", "" diff --git a/ng-sample/app/app.ts b/ng-sample/app/app.ts index bf72639af..86b2aaad2 100644 --- a/ng-sample/app/app.ts +++ b/ng-sample/app/app.ts @@ -7,7 +7,6 @@ import { DOCUMENT } from "@angular/common"; import { Router } from "@angular/router"; import { NativeScriptRouterModule } from "nativescript-angular/router"; import { NativeScriptFormsModule } from "nativescript-angular/forms"; -import { NativeScriptHttpModule } from "nativescript-angular/http"; import { NativeScriptHttpClientModule } from "nativescript-angular/http-client"; import { @@ -42,7 +41,6 @@ import { ListTest } from "./examples/list/list-test"; import { ListTemplateSelectorTest } from "./examples/list/template-selector"; import { ListTestAsync, ListTestFilterAsync } from "./examples/list/list-test-async"; import { ImageTest } from "./examples/image/image-test"; -import { HttpTest } from "./examples/http/http-test"; import { HttpClientTest } from "./examples/http-client/http-client-test"; import { ActionBarTest } from "./examples/action-bar/action-bar-test"; import { PlatfromDirectivesTest } from "./examples/platform-directives/platform-directives-test"; @@ -73,14 +71,12 @@ import { AnimationStatesMultiTest } from "./examples/animation/animation-states- imports: [ NativeScriptModule, NativeScriptFormsModule, - NativeScriptHttpModule, NativeScriptHttpClientModule, NativeScriptRouterModule, ], exports: [ NativeScriptModule, NativeScriptFormsModule, - NativeScriptHttpModule, NativeScriptHttpClientModule, NativeScriptRouterModule, ], @@ -146,7 +142,6 @@ class MyErrorHandler implements ErrorHandler { platformNativeScriptDynamic().bootstrapModule(makeExampleModule(ListTestAsync)); // platformNativeScriptDynamic().bootstrapModule(makeExampleModule(ImageTest)); // platformNativeScriptDynamic().bootstrapModule(makeExampleModule(ModalTest)); -// platformNativeScriptDynamic().bootstrapModule(makeExampleModule(HttpTest)); // platformNativeScriptDynamic().bootstrapModule(makeExampleModule(HttpClientTest)); // platformNativeScriptDynamic().bootstrapModule(makeExampleModule(PlatfromDirectivesTest)); // platformNativeScriptDynamic().bootstrapModule(makeExampleModule(ActionBarTest)); diff --git a/ng-sample/app/examples/http-client/http-client-test.ts b/ng-sample/app/examples/http-client/http-client-test.ts index ed6f784d3..dc0282ced 100644 --- a/ng-sample/app/examples/http-client/http-client-test.ts +++ b/ng-sample/app/examples/http-client/http-client-test.ts @@ -70,7 +70,7 @@ export class HttpClientTest { } public loadLocal() { - this.http.get>("~/examples/http/data.json") + this.http.get>("~/examples/http-client/data.json") .subscribe((response) => { let user = response.results[0]; this.onSuccess(user.title, user.description); diff --git a/ng-sample/app/examples/http/data.json b/ng-sample/app/examples/http/data.json deleted file mode 100644 index 52d4169d4..000000000 --- a/ng-sample/app/examples/http/data.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "results": [ - { - "title": "Test", - "description": "Testing Http local and remote." - } - ] -} diff --git a/ng-sample/app/examples/http/http-test.ts b/ng-sample/app/examples/http/http-test.ts deleted file mode 100644 index 15e84c70b..000000000 --- a/ng-sample/app/examples/http/http-test.ts +++ /dev/null @@ -1,56 +0,0 @@ -import { Component } from "@angular/core"; -import { Http } from "@angular/http"; -import { map } from "rxjs/operators"; - -/* IMPORTANT -In order to test out the full image example, -to fix the App Transport Security error in iOS 9, -you will need to follow this after adding the iOS platform: - -https://blog.nraboy.com/2015/12/fix-ios-9-app-transport-security-issues-in-nativescript/ -*/ - -@Component({ - selector: "http-test", - template: ` - - - - - - - `, - styles: [ - `Button { - margin-bottom:20; - }` - ], -}) -export class HttpTest { - public title: string; - public description: string; - - constructor(private http: Http) { - - } - - public loadLocal() { - this.http.get("~/examples/http/data.json").pipe( - map(res => res.json()) - ).subscribe((response: any) => { - let user = response.results[0]; - this.title = user.title; - this.description = user.description; - }); - } - - public loadRemote() { - this.http.get(`https://randomuser.me/api/?results=1&nat=us`) - .pipe(map(res => res.json())) - .subscribe((response: any) => { - let user = response.results[0]; - this.title = user.name.first; - this.description = user.email; - }); - } -} diff --git a/ng-sample/app/examples/list/list-test-async.ts b/ng-sample/app/examples/list/list-test-async.ts index 20206a2d1..b4a8a7215 100644 --- a/ng-sample/app/examples/list/list-test-async.ts +++ b/ng-sample/app/examples/list/list-test-async.ts @@ -5,7 +5,7 @@ import { combineLatest } from "rxjs/operators"; @Component({ selector: "list-test-async", - styleUrls: ["examples/list/styles.css"], + styleUrls: ["./styles.css"], providers: [DataService], changeDetection: ChangeDetectionStrategy.OnPush, template: ` @@ -58,7 +58,7 @@ export class ListTestAsync { @Component({ selector: "list-test-async-filter", - styleUrls: ["examples/list/styles.css"], + styleUrls: ["./styles.css"], providers: [DataService], changeDetection: ChangeDetectionStrategy.OnPush, template: ` diff --git a/ng-sample/app/examples/list/list-test.ts b/ng-sample/app/examples/list/list-test.ts index 0a93bd4ad..db2cfe257 100644 --- a/ng-sample/app/examples/list/list-test.ts +++ b/ng-sample/app/examples/list/list-test.ts @@ -8,7 +8,7 @@ class DataItem { @Component({ selector: "item-component", - styleUrls: ["examples/list/styles.css"], + styleUrls: ["./styles.css"], changeDetection: ChangeDetectionStrategy.OnPush, template: ` @@ -35,7 +35,7 @@ export class ItemComponent implements AfterViewChecked, DoCheck { @Component({ selector: "list-test", - styleUrls: ["examples/list/styles.css"], + styleUrls: ["./styles.css"], changeDetection: ChangeDetectionStrategy.OnPush, template: ` diff --git a/ng-sample/app/examples/list/template-selector.ts b/ng-sample/app/examples/list/template-selector.ts index 54c11b28e..3cd9ec38f 100644 --- a/ng-sample/app/examples/list/template-selector.ts +++ b/ng-sample/app/examples/list/template-selector.ts @@ -10,7 +10,7 @@ class DataItem { @Component({ selector: "item-component", - styleUrls: ["examples/list/styles.css"], + styleUrls: ["./styles.css"], changeDetection: ChangeDetectionStrategy.OnPush, template: `` }) @@ -21,7 +21,7 @@ export class ItemComponent implements DoCheck { @Component({ selector: "header-component", - styleUrls: ["examples/list/styles.css"], + styleUrls: ["./styles.css"], changeDetection: ChangeDetectionStrategy.OnPush, template: `` }) @@ -32,7 +32,7 @@ export class HeaderComponent implements DoCheck { @Component({ selector: "list-test", - styleUrls: ["examples/list/styles.css"], + styleUrls: ["./styles.css"], changeDetection: ChangeDetectionStrategy.OnPush, template: ` diff --git a/ng-sample/app/examples/router/page-router-outlet-test.ts b/ng-sample/app/examples/router/page-router-outlet-test.ts index 84c6f3606..ed30a8c67 100644 --- a/ng-sample/app/examples/router/page-router-outlet-test.ts +++ b/ng-sample/app/examples/router/page-router-outlet-test.ts @@ -7,7 +7,7 @@ import { map } from "rxjs/operators"; @Component({ selector: "first", - styleUrls: ["examples/router/styles.css"], + styleUrls: ["./styles.css"], template: ` @@ -34,7 +34,7 @@ export class FirstComponent implements OnInit, OnDestroy { @Component({ selector: "second", - styleUrls: ["examples/router/styles.css"], + styleUrls: ["./styles.css"], template: ` @@ -68,7 +68,7 @@ export class SecondComponent implements OnInit, OnDestroy { @Component({ selector: "third", - styleUrls: ["examples/router/styles.css"], + styleUrls: ["./styles.css"], template: ` diff --git a/ng-sample/package.json b/ng-sample/package.json index a3ba2503b..8dbf3d5ae 100644 --- a/ng-sample/package.json +++ b/ng-sample/package.json @@ -26,31 +26,32 @@ }, "homepage": "https://github.com/NativeScript/template-hello-world", "dependencies": { - "@angular/animations": "~8.1.0", - "@angular/common": "~8.1.0", - "@angular/compiler": "~8.1.0", - "@angular/core": "~8.1.0", - "@angular/forms": "~8.1.0", - "@angular/http": "8.0.0-beta.10", - "@angular/platform-browser": "~8.1.0", - "@angular/platform-browser-dynamic": "~8.1.0", - "@angular/router": "~8.1.0", + "@angular/animations": "~8.2.0", + "@angular/common": "~8.2.0", + "@angular/compiler": "~8.2.0", + "@angular/core": "~8.2.0", + "@angular/forms": "~8.2.0", + "@angular/platform-browser": "~8.2.0", + "@angular/platform-browser-dynamic": "~8.2.0", + "@angular/router": "~8.2.0", "nativescript-angular": "file:../nativescript-angular", - "rxjs": "~6.3.3", + "rxjs": "^6.4.0", "tns-core-modules": "next", "tns-platform-declarations": "next", "zone.js": "^0.9.1" }, "devDependencies": { + "@angular/compiler-cli": "~8.2.0", + "@ngtools/webpack": "~8.2.0", "babel-traverse": "6.9.0", "babel-types": "6.10.0", "babylon": "6.8.1", "filewalker": "0.1.2", "lazy": "1.0.11", - "nativescript-dev-typescript": "next", + "nativescript-dev-webpack": "~1.0.1", "shelljs": "^0.7.0", "tslint": "^4.5.1", - "typescript": "~3.4.5" + "typescript": "~3.5.3" }, "scripts": { "tslint": "tslint --project tsconfig.json --config tslint.json", diff --git a/ng-sample/tsconfig.json b/ng-sample/tsconfig.json index 4f07c2af2..b73d56d49 100644 --- a/ng-sample/tsconfig.json +++ b/ng-sample/tsconfig.json @@ -20,10 +20,19 @@ "*": [ "./node_modules/tns-core-modules/*", "./node_modules/*" + ], + "~/*": [ + "app/*" ] }, }, + "include": [ + "../nativescript-angular", + "**/*" + ], "exclude": [ + "../nativescript-angular/node_modules", + "../nativescript-angular/**/*.d.ts", "node_modules", "platforms" ] diff --git a/tests/app/tests/http.ts b/tests/app/tests/http.ts deleted file mode 100644 index 7aa625fef..000000000 --- a/tests/app/tests/http.ts +++ /dev/null @@ -1,116 +0,0 @@ -// make sure you import mocha-config before @angular/core -import { assert } from "./test-config"; -import { - async, - inject, -} from "@angular/core/testing"; -import { ReflectiveInjector, Injectable } from "@angular/core"; -import { Request, BaseRequestOptions, ConnectionBackend, Http, Response, ResponseOptions } from "@angular/http"; -import { map } from "rxjs/operators"; -import { MockBackend } from "@angular/http/testing"; -import { NSHttp } from "nativescript-angular/http/ns-http"; -import { NSFileSystem } from "nativescript-angular/file-system/ns-file-system"; - -const AWESOME_TEAM: string = '[{"name":"Alex"}, {"name":"Rosen"}, {"name":"Panayot"}]'; - -// Filesystem mock -@Injectable() -export class NSFileSystemMock implements NSFileSystem { - public currentApp(): any { - return { path: "/app/dir" }; - } - - public fileFromPath(path: string): any { - if (path === "/app/dir/test.json") { - return { - readText: () => { return Promise.resolve(AWESOME_TEAM); } - }; - } - throw new Error("Opening non-existing file"); - } - - public fileExists(path: string): boolean { - return path === "/app/dir/test.json"; - } - -} - -describe("Http", () => { - let http: Http; - let backend: MockBackend; - - beforeEach(() => { - let injector = ReflectiveInjector.resolveAndCreate([ - BaseRequestOptions, - MockBackend, - { provide: NSFileSystem, useClass: NSFileSystemMock }, - { - provide: Http, - useFactory: function ( - connectionBackend: ConnectionBackend, - defaultOptions: BaseRequestOptions, - nsFileSystem: NSFileSystem) { - // HACK: cast backend to any to work around an angular typings problem - return new NSHttp(connectionBackend, defaultOptions, nsFileSystem); - }, - deps: [MockBackend, BaseRequestOptions, NSFileSystem] - } - ]); - - backend = injector.get(MockBackend); - http = injector.get(Http); - }); - - it("should work with local files prefixed with '~'", () => { - http.get("~/test.json").pipe( - map(res => res.json()) - ).subscribe((response: any) => { - assert.strictEqual(3, response.length); - assert.strictEqual("Alex", response[0].name); - }); - }); - - it("request method should work with local files prefixed with '~'", () => { - http.request("~/test.json").pipe( - map(res => res.json()) - ).subscribe((response: any) => { - assert.strictEqual(3, response.length); - assert.strictEqual("Alex", response[0].name); - }); - }); - - it("request method using Request type should work with local files prefixed with '~'", () => { - const url = "~/test.json"; - const req = new Request({ - method: 'GET', - url - }); - http.request(req).pipe( - map(res => res.json()) - ).subscribe((response: any) => { - assert.strictEqual(3, response.length); - assert.strictEqual("Alex", response[0].name); - }); - }); - - it("should work with local files prefixed with '/'", () => { - http.get("/test.json").pipe( - map(res => res.json()) - ).subscribe((response: any) => { - assert.strictEqual(3, response.length); - assert.strictEqual("Panayot", response[2].name); - }); - }); - - it("should work with remote files", () => { - let connection: any; - backend.connections.subscribe((c: any) => connection = c); - http.get("http://www.nativescript.org/test.json").pipe( - map(res => res.json()) - ).subscribe((response: any) => { - assert.strictEqual(3, response.length); - assert.strictEqual("Rosen", response[1].name); - }); - connection.mockRespond(new Response(new ResponseOptions({ body: AWESOME_TEAM }))); - }); -}); diff --git a/tests/package.json b/tests/package.json index 1f02808aa..55bd35ee1 100644 --- a/tests/package.json +++ b/tests/package.json @@ -19,18 +19,17 @@ ], "homepage": "http://nativescript.org", "dependencies": { - "@angular/animations": "~8.1.0", - "@angular/common": "~8.1.0", - "@angular/compiler": "~8.1.0", - "@angular/core": "~8.1.0", - "@angular/forms": "~8.1.0", - "@angular/http": "8.0.0-beta.10", - "@angular/platform-browser": "~8.1.0", - "@angular/platform-browser-dynamic": "~8.1.0", - "@angular/router": "~8.1.0", + "@angular/animations": "~8.2.0", + "@angular/common": "~8.2.0", + "@angular/compiler": "~8.2.0", + "@angular/core": "~8.2.0", + "@angular/forms": "~8.2.0", + "@angular/platform-browser": "~8.2.0", + "@angular/platform-browser-dynamic": "~8.2.0", + "@angular/router": "~8.2.0", "nativescript-angular": "../nativescript-angular", "nativescript-unit-test-runner": "0.7.0", - "rxjs": "~6.3.3", + "rxjs": "^6.4.0", "tns-core-modules": "next", "zone.js": "^0.9.1" }, @@ -58,7 +57,7 @@ "remove-strict-webpack-plugin": "~0.1.2", "sinon": "^7.3.2", "tslint": "^4.5.1", - "typescript": "~3.4.5" + "typescript": "~3.5.3" }, "scripts": { "e2e": "tsc -p e2e && mocha --opts ../e2e/config/mocha.opts --recursive e2e --appiumCapsLocation ../e2e/config/appium.capabilities.json",