From 64f7070943ac58dc76e9d52dd42382153cd3220c Mon Sep 17 00:00:00 2001 From: vakrilov Date: Thu, 13 Apr 2017 14:15:35 +0300 Subject: [PATCH 1/4] Update package.json to v3.0.0 --- CHANGELOG.md | 3 ++ nativescript-angular/package.json | 57 ++++++++++++++++++++++--------- nativescript-angular/tslint.json | 5 +-- tests/package.json | 2 ++ 4 files changed, 47 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 424e4dcd2..db4779636 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# 3.0.0 (2017-xx-xx) +- Compatible with Angular 4 and NativeScript 3.0 + # 1.1.2 (2016-10-28) - Angular 2.1.2 compatibility release diff --git a/nativescript-angular/package.json b/nativescript-angular/package.json index e9d84752b..5d22498d8 100644 --- a/nativescript-angular/package.json +++ b/nativescript-angular/package.json @@ -1,12 +1,27 @@ { "private": true, "name": "nativescript-angular", - "version": "2.0.0", + "version": "3.0.0", "description": "An Angular 2 renderer that lets you build mobile apps with NativeScript.", - "homepage": "http://www.telerik.com", - "bugs": "http://www.telerik.com", + "homepage": "https://www.nativescript.org/", + "bugs": "https://github.com/NativeScript/nativescript-angular/issues", + "author": { + "name": "NativeScript Team" + }, "contributors": [ - "Hristo Deshev " + "Hristo Deshev ", + "Alexander Vakrilov ", + "Stanimira Vlaeva " + ], + "nativescript": { + "platforms": { + "android": "3.0.0", + "ios": "3.0.0" + } + }, + "keywords": [ + "NativeScript", + "Angular" ], "license": "Apache-2.0", "repository": { @@ -25,28 +40,38 @@ }, "dependencies": { "nativescript-intl": "~0.0.8", + "reflect-metadata": "~0.1.8" + }, + "peerDependencies": { "@angular/core": "~4.0.0", "@angular/common": "~4.0.0", "@angular/compiler": "~4.0.0", - "@angular/http": "~4.0.0", "@angular/platform-browser": "~4.0.0", - "@angular/platform-browser-dynamic": "~4.0.0", - "@angular/forms": "~4.0.0", + "@angular/animations": "~4.0.0", "@angular/router": "~4.0.0", + "@angular/forms": "~4.0.0", + "@angular/http": "~4.0.0", + "tns-core-modules": "^3.0.0 || ^3.0.0-rc.1", "rxjs": "^5.0.1", - "reflect-metadata": "~0.1.8", - "punycode": "1.3.2", - "querystring": "0.2.0", - "url": "0.10.3" + "zone.js": "^0.8.4" }, "devDependencies": { - "@angular/animations": "~4.0.0", + "@angular/core": "~4.0.0", + "@angular/common": "~4.0.0", + "@angular/compiler": "~4.0.0", "@angular/compiler-cli": "~4.0.0", + "@angular/platform-browser": "~4.0.0", + "@angular/animations": "~4.0.0", + "@angular/router": "~4.0.0", + "@angular/forms": "~4.0.0", + "@angular/http": "~4.0.0", "codelyzer": "~3.0.0-beta.4", + "nativescript-intl": "^0.0.8", "tns-core-modules": "internal-preview", "tslint": "~4.5.0", "typescript": "~2.2.1", - "zone.js": "^0.8.2" - }, - "nativescript": {} -} + "rxjs": "^5.0.1", + "reflect-metadata": "^0.1.8", + "zone.js": "^0.8.4" + } +} \ No newline at end of file diff --git a/nativescript-angular/tslint.json b/nativescript-angular/tslint.json index 90e38b36c..4db4b9408 100644 --- a/nativescript-angular/tslint.json +++ b/nativescript-angular/tslint.json @@ -10,14 +10,10 @@ "use-host-property-decorator": true, "no-input-rename": true, "no-output-rename": true, - "use-life-cycle-interface": true, "use-pipe-transform-interface": true, "pipe-naming": [true, "camelCase", "ns"], "component-class-suffix": true, "directive-class-suffix": true, - "import-destructuring-spacing": true, - "templates-use-public": true, - "no-access-missing-member": true, "invoke-injectable": true, "member-access": false, "no-any": false, @@ -129,6 +125,7 @@ true, "check-branch", "check-decl", + "check-module", "check-operator", "check-separator", "check-type" diff --git a/tests/package.json b/tests/package.json index a875f0522..7b579e011 100644 --- a/tests/package.json +++ b/tests/package.json @@ -26,9 +26,11 @@ ], "homepage": "http://nativescript.org", "dependencies": { + "@angular/animations": "~4.0.0", "@angular/common": "~4.0.0", "@angular/compiler": "~4.0.0", "@angular/core": "~4.0.0", + "@angular/forms": "~4.0.0", "@angular/http": "~4.0.0", "@angular/platform-browser": "~4.0.0", "@angular/platform-browser-dynamic": "~4.0.0", From 01f0fe655c310298d7de62ef59a8a63acbd96a12 Mon Sep 17 00:00:00 2001 From: Vasil Chimev Date: Thu, 13 Apr 2017 15:04:10 +0300 Subject: [PATCH 2/4] Update description field --- nativescript-angular/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nativescript-angular/package.json b/nativescript-angular/package.json index 5d22498d8..f751bb27d 100644 --- a/nativescript-angular/package.json +++ b/nativescript-angular/package.json @@ -2,7 +2,7 @@ "private": true, "name": "nativescript-angular", "version": "3.0.0", - "description": "An Angular 2 renderer that lets you build mobile apps with NativeScript.", + "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", "author": { @@ -74,4 +74,4 @@ "reflect-metadata": "^0.1.8", "zone.js": "^0.8.4" } -} \ No newline at end of file +} From 5739c31863d709fe0b11adba7631a317f685149a Mon Sep 17 00:00:00 2001 From: vchimev Date: Thu, 13 Apr 2017 15:09:46 +0300 Subject: [PATCH 3/4] Update CHANGELOG.md --- CHANGELOG.md | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index db4779636..ee7f6b48c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,76 @@ # 3.0.0 (2017-xx-xx) - Compatible with Angular 4 and NativeScript 3.0 + +## [1.5.1](https://github.com/NativeScript/nativescript-angular/compare/v1.5.0...v1.5.1) (2017-03-30) + + +### Bug Fixes + +* **action bar:** attach #comment nodes with _addView ([#729](https://github.com/NativeScript/nativescript-angular/issues/729)) ([be93db6](https://github.com/NativeScript/nativescript-angular/commit/be93db6)), closes [#725](https://github.com/NativeScript/nativescript-angular/issues/725) +* **ns-router-link:** navigate with urlTree ([#728](https://github.com/NativeScript/nativescript-angular/issues/728)) ([71058f8](https://github.com/NativeScript/nativescript-angular/commit/71058f8)), closes [#724](https://github.com/NativeScript/nativescript-angular/issues/724) + + + + +# [1.5.0](https://github.com/NativeScript/nativescript-angular/compare/v1.4.1...v1.5.0) (2017-03-22) + +### Bug Fixes + +* **action-bar:** Don't remove action items twice. ([677d7e0](https://github.com/NativeScript/nativescript-angular/commit/677d7e0)) +* **animations:** add onDestroy method to NativeScriptAnimationPlayer ([2e24010](https://github.com/NativeScript/nativescript-angular/commit/2e24010)) +* **dom_adapter:** add missing `contains` method signature ([bae45f6](https://github.com/NativeScript/nativescript-angular/commit/bae45f6)) +* **dom_adapter:** update setTitle and getGlobalEventTarget to be compliant with Angular API ([25c134d](https://github.com/NativeScript/nativescript-angular/commit/25c134d)) +* **gitignore:** Add editor files into gitignore ([819a960](https://github.com/NativeScript/nativescript-angular/commit/819a960)) +* **init:** Bootstrap Angular on page "navigatingTo" event. ([ab04aba](https://github.com/NativeScript/nativescript-angular/commit/ab04aba)) +* **list-view-comp:** IterableDiffer is now parameterized on \ ([780967d](https://github.com/NativeScript/nativescript-angular/commit/780967d)) +* **ns-http:** make defaultOptions of type RequestOptions ([db730e2](https://github.com/NativeScript/nativescript-angular/commit/db730e2)) +* **page-router-outlet:** activateWith instead of activate method ([8d832bc](https://github.com/NativeScript/nativescript-angular/commit/8d832bc)) +* **page-router-outlet:** manually run detect changes when navigating to new page ([07caa74](https://github.com/NativeScript/nativescript-angular/commit/07caa74)) +* **platform:** import InjectionToken and ViewEncapsulation instead of OpaqueToken ([c4dc8d4](https://github.com/NativeScript/nativescript-angular/commit/c4dc8d4)) +* **platform:** import MissingTranslationStrategy ([d2328a5](https://github.com/NativeScript/nativescript-angular/commit/d2328a5)) +* **renderer:** implement createComment and createText methods using Placeholders ([c0ec870](https://github.com/NativeScript/nativescript-angular/commit/c0ec870)) +* **renderer:** use _eachChildView for nextSibling ([150c1ce](https://github.com/NativeScript/nativescript-angular/commit/150c1ce)) +* **renderer:** use flags in `setStyle` and `removeStyle` instead of booleans ([a6d9247](https://github.com/NativeScript/nativescript-angular/commit/a6d9247)) +* **ts:** ship package with reference to iterable interface ([7edfa6b](https://github.com/NativeScript/nativescript-angular/commit/7edfa6b)) + + +### Code Refactoring + +* stop exporting NativeScriptModule from platform ([#701](https://github.com/NativeScript/nativescript-angular/issues/701)) ([409e717](https://github.com/NativeScript/nativescript-angular/commit/409e717)) + + +### Features + +* **animations:** introduce NativeScriptAnimationsModule ([b5874ba](https://github.com/NativeScript/nativescript-angular/commit/b5874ba)) +* **renderer:** implement simple nextSibling method using parent's _eachChildView ([98d9d20](https://github.com/NativeScript/nativescript-angular/commit/98d9d20)) +* **renderer:** upgrade to be compliant with Angular 4's Renderer2 and RendererFactory2 ([a3adcca](https://github.com/NativeScript/nativescript-angular/commit/a3adcca)) +* **renderer:** use EmulatedRenderer to scope component styles ([25f5111](https://github.com/NativeScript/nativescript-angular/commit/25f5111)) + + +### BREAKING CHANGES + +* **NativeScriptModule:** User applications cannot import NativeScriptModule from +"nativescript-angular/platform" anymore. +Migration: +Before: +``` +import { NativeScriptModule } from "nativescript-angular/platform"; +``` +After +``` +import { NativeScriptModule } from +"nativescript-angular/nativescript.module"; +``` +* **animations:** To use animations, you need to import the +NativeScriptAnimationsModule from "nativescript-angular/animations" in +your root NgModule. Also you need a dependency to "@angular/animations". + +* **typescript:** The required version of TypeScript is ~2.1. Support for ~2.2 requires changes in `tns-core-modules` and will be provided with NativeScript 3.0. + + # 1.1.2 (2016-10-28) + - Angular 2.1.2 compatibility release # 1.1.1 (2016-10-21) From 07e832a36c1e8734a594729d290925643dbede94 Mon Sep 17 00:00:00 2001 From: vakrilov Date: Thu, 13 Apr 2017 16:35:00 +0300 Subject: [PATCH 4/4] More deps and readme changes --- CHANGELOG.md | 3 --- README.md | 4 ++-- nativescript-angular/README.md | 2 +- nativescript-angular/package.json | 6 ++---- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee7f6b48c..ba9d374f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,3 @@ -# 3.0.0 (2017-xx-xx) -- Compatible with Angular 4 and NativeScript 3.0 - ## [1.5.1](https://github.com/NativeScript/nativescript-angular/compare/v1.5.0...v1.5.1) (2017-03-30) diff --git a/README.md b/README.md index 78b6a2e16..44d7e2a50 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![Build Status](https://travis-ci.org/NativeScript/nativescript-angular.svg?branch=master)](https://travis-ci.org/NativeScript/nativescript-angular) -Integrating NativeScript with Angular 2. +Integrating NativeScript with Angular. # Running locally @@ -68,7 +68,7 @@ npm link nativescript-angular 1. Make changes to the `test`, `ng-sample` projects or in `nativescript-angular` folder. 2. Run the `tests` or `ng-sample` using as shown above. -# Watch the video explaining Angular 2 and NativeScript +# Watch the video explaining Angular and NativeScript [NativeScript session on AngularConnect conference](https://www.youtube.com/watch?v=4SbiiyRSIwo) # Explore the examples diff --git a/nativescript-angular/README.md b/nativescript-angular/README.md index 1a5348eaf..8f87f938c 100644 --- a/nativescript-angular/README.md +++ b/nativescript-angular/README.md @@ -1 +1 @@ -[Get started with Angular 2 and NativeScript.](http://docs.nativescript.org/angular/start/introduction.html) +[Get started with Angular and NativeScript.](http://docs.nativescript.org/angular/start/introduction.html) diff --git a/nativescript-angular/package.json b/nativescript-angular/package.json index f751bb27d..c3993ae35 100644 --- a/nativescript-angular/package.json +++ b/nativescript-angular/package.json @@ -39,8 +39,8 @@ "update-app-ng-deps": "./bin/update-app-ng-deps" }, "dependencies": { - "nativescript-intl": "~0.0.8", - "reflect-metadata": "~0.1.8" + "nativescript-intl": "^0.0.8", + "reflect-metadata": "^0.1.8" }, "peerDependencies": { "@angular/core": "~4.0.0", @@ -66,12 +66,10 @@ "@angular/forms": "~4.0.0", "@angular/http": "~4.0.0", "codelyzer": "~3.0.0-beta.4", - "nativescript-intl": "^0.0.8", "tns-core-modules": "internal-preview", "tslint": "~4.5.0", "typescript": "~2.2.1", "rxjs": "^5.0.1", - "reflect-metadata": "^0.1.8", "zone.js": "^0.8.4" } }