From 45d6edf96518e448f109c7e062d8aaedcf03faf8 Mon Sep 17 00:00:00 2001
From: Vasil Chimev <Vasil.Chimev@telerik.com>
Date: Mon, 16 Oct 2017 15:52:09 +0300
Subject: [PATCH 01/26] docs: describe comment messages available to test
 (#1027)

* docs: describe comment messages available to test

* docs: add describe comment messages to test

* docs: add notes
---
 PULL_REQUEST_TESTS.md | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 PULL_REQUEST_TESTS.md

diff --git a/PULL_REQUEST_TESTS.md b/PULL_REQUEST_TESTS.md
new file mode 100644
index 000000000..db4207541
--- /dev/null
+++ b/PULL_REQUEST_TESTS.md
@@ -0,0 +1,24 @@
+### Pull Requests Checks
+
+Builds distributed between Travis CI and internal Jenkins CI execute on pull requests. By default, Travis CI builds trigger on community pull requests and both Travis CI and Jenkins CI builds trigger on core team pull requests. Only NativeScript members have rights to trigger internal Jenkins CI builds. In long term, we aim to migrate all the builds in a public cloud environment.
+
+### Travis
+
+This builds the `nativescript-angular` package and the [tests](https://github.com/NativeScript/nativescript-angular/tree/master/tests) app for Android. Please, refer to the [.travis.yml](https://github.com/NativeScript/nativescript-angular/blob/master/.travis.yml) config file for complete information.
+
+### Jenkins
+
+More extensive tests execute in Jenkins CI. As it is an internal environment, these builds cannot be triggered from people outside the NativeScript organization. In order to trigger a build mannually, you need to comment inside the pull request. The table below describes the comment messages and the locations of the app/tests of all builds available to execute tests on pull requests.
+
+|Comment             |Description|
+|:------------------:|:---------:|
+|`run ci`            |Executes all described below.|
+|`renderer-android`  |Executes [renderer](https://github.com/NativeScript/nativescript-angular/tree/master/e2e/renderer) tests app for Android.|
+|`renderer-ios`      |Executes [renderer](https://github.com/NativeScript/nativescript-angular/tree/master/e2e/renderer) tests app for iOS.|
+|`router-android`    |Executes [router](https://github.com/NativeScript/nativescript-angular/tree/master/e2e/router) tests app for Android.|
+|`router-ios`        |Executes [router](https://github.com/NativeScript/nativescript-angular/tree/master/e2e/router) tests app for iOS.|
+|`sdkwebpack`        |Webpacks [SDK](https://github.com/NativeScript/nativescript-sdk-examples-ng) examples app for both Android and iOS.|
+|`tests-android`     |Executes [tests](https://github.com/NativeScript/nativescript-angular/tree/master/tests) app for Android.|
+|`tests-ios`         |Executes [tests](https://github.com/NativeScript/nativescript-angular/tree/master/tests) app for iOS.|
+|`testsappng-android`|Executes [TestsAppNg](https://github.com/NativeScript/tests-app-ng) app for Android.|
+|`testsappng-ios`    |Executes [TestsAppNg](https://github.com/NativeScript/tests-app-ng) app for iOS.|

From e589401c959d539eda0a53e98c8a75fabe11070c Mon Sep 17 00:00:00 2001
From: Panayot Cankov <Panayot.Cankov@telerik.com>
Date: Wed, 18 Oct 2017 10:36:17 +0300
Subject: [PATCH 02/26] Add tests to ensure native setters are called exactly
 once when components are instantiated (#816)

---
 tests/app/logo.png                | Bin 0 -> 4918 bytes
 tests/app/tests/renderer-tests.ts |  93 +++++++++++++++++++++++++++++-
 tests/app/tests/test-app.ts       |   2 +-
 3 files changed, 92 insertions(+), 3 deletions(-)
 create mode 100644 tests/app/logo.png

diff --git a/tests/app/logo.png b/tests/app/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..add1ce15d7477b400746e55468e587caa12c17f1
GIT binary patch
literal 4918
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

literal 0
HcmV?d00001

diff --git a/tests/app/tests/renderer-tests.ts b/tests/app/tests/renderer-tests.ts
index 3c2ccd506..ebb9091ee 100644
--- a/tests/app/tests/renderer-tests.ts
+++ b/tests/app/tests/renderer-tests.ts
@@ -1,6 +1,6 @@
 // make sure you import mocha-config before @angular/core
 import { assert } from "./test-config";
-import { Component, ElementRef, Renderer2, NgZone } from "@angular/core";
+import { Component, ElementRef, Renderer2, NgZone, ViewChild } from "@angular/core";
 import { ProxyViewContainer } from "ui/proxy-view-container";
 import { Red } from "color/known-colors";
 import { dumpView } from "./test-utils";
@@ -10,6 +10,9 @@ import { StackLayout } from "ui/layouts/stack-layout";
 import { ContentView } from "ui/content-view";
 import { Button } from "ui/button";
 import { NgView } from "nativescript-angular/element-registry";
+import { registerElement } from "nativescript-angular/element-registry";
+import * as button from "tns-core-modules/ui/button";
+import * as view from "tns-core-modules/ui/core/view";
 
 @Component({
     template: `<StackLayout><Label text="Layout"></Label></StackLayout>`
@@ -169,6 +172,60 @@ export class NgIfThenElseComponent {
     }
 }
 
+export class ButtonCounter extends button.Button {
+    nativeBackgroundRedraws = 0;
+    backgroundInternalSetNativeCount = 0;
+    fontInternalSetNativeCount = 0;
+
+    [view.backgroundInternalProperty.setNative](value) {
+        this.backgroundInternalSetNativeCount++;
+        return super[view.backgroundInternalProperty.setNative](value);
+    }
+    [view.fontInternalProperty.setNative](value) {
+        this.fontInternalSetNativeCount++;
+        return super[view.fontInternalProperty.setNative](value);
+    }
+    _redrawNativeBackground(value: any): void {
+        this.nativeBackgroundRedraws++;
+        super["_redrawNativeBackground"](value);
+    }
+}
+registerElement("ButtonCounter", () => ButtonCounter);
+
+@Component({
+    selector: "ng-control-setters-count",
+    template: `
+        <StackLayout>
+            <ButtonCounter #btn1 id="btn1" borderWidth="1" borderColor="gray" borderRadius="16" fontWeight="bold" fontSize="16"></ButtonCounter>
+            <ButtonCounter #btn2 id="btn2"></ButtonCounter>
+            <ButtonCounter #btn3 id="btn3" borderWidth="1" borderColor="gray" borderRadius="16" fontWeight="bold" fontSize="16"></ButtonCounter>
+            <ButtonCounter #btn4 id="btn4" borderRadius="3" style="background-image: url('~/logo.png'); background-position: center; background-repeat: no-repeat; background-size: cover;"></ButtonCounter>
+        </StackLayout>
+    `,
+    styles: [`
+        #btn2, #btn3, #btn4 {
+            border-width: 2;
+            border-color: teal;
+            border-radius: 20;
+            font-weight: 400;
+            font-size: 32;
+        }`]
+})
+export class NgControlSettersCount {
+    @ViewChild("btn1") btn1: ElementRef;
+    @ViewChild("btn2") btn2: ElementRef;
+    @ViewChild("btn3") btn3: ElementRef;
+    @ViewChild("btn3") btn4: ElementRef;
+
+    get buttons(): ElementRef[] { return [this.btn1, this.btn2, this.btn3, this.btn4]; }
+
+    isAfterViewInit: boolean = false;
+
+    ngAfterViewInit() {
+        this.isAfterViewInit = true;
+    }
+}
+
 @Component({
     selector: "ng-for-label",
     template: `<Label *ngFor="let item of items" [text]="item"></Label>`
@@ -488,7 +545,6 @@ describe("Renderer createElement", () => {
     });
 });
 
-
 describe("Renderer attach/detach", () => {
     let testApp: TestApp = null;
     let renderer: Renderer2 = null;
@@ -545,3 +601,36 @@ describe("Renderer attach/detach", () => {
     });
 });
 
+describe("Renderer lifecycle", () => {
+    let testApp: TestApp = null;
+    let renderer: Renderer2 = null;
+
+    before(() => {
+        return TestApp.create([], [NgControlSettersCount]).then((app) => {
+            testApp = app;
+            renderer = testApp.renderer;
+        });
+    });
+
+    after(() => {
+        testApp.dispose();
+    });
+
+    afterEach(() => {
+        testApp.disposeComponents();
+    });
+
+    it("view native setters are called once on startup", () => {
+        return testApp.loadComponent(NgControlSettersCount).then((componentRef) => {
+            assert.isTrue(componentRef.instance.isAfterViewInit, "Expected the NgControlSettersCount to have passed its ngAfterViewInit.");
+            componentRef.instance.buttons.map(btn => btn.nativeElement).forEach(btn => {
+                assert.isTrue(btn.isLoaded, `Expected ${btn.id} to be allready loaded.`);
+                assert.isFalse(btn.isLayoutValid, `Expected ${btn.id}'s layout to be invalid.`);
+
+                assert.equal(btn.backgroundInternalSetNativeCount, 1, `Expected ${btn.id} backgroundInternalSetNativeCount to be called just once.`);
+                assert.equal(btn.fontInternalSetNativeCount, 1, `Expected ${btn.id} fontInternalSetNativeCount to be called just once.`);
+                assert.equal(btn.nativeBackgroundRedraws, 0, `Expected ${btn.id} nativeBackgroundRedraws to be called after its layout pass.`);
+            });
+        });
+    });
+});
diff --git a/tests/app/tests/test-app.ts b/tests/app/tests/test-app.ts
index 33399903a..fd481c67c 100644
--- a/tests/app/tests/test-app.ts
+++ b/tests/app/tests/test-app.ts
@@ -30,7 +30,7 @@ export class TestApp {
         registerTestApp(TestApp, this, appRef);
     }
 
-    public loadComponent(componentType: Type<any>): Promise<ComponentRef<any>> {
+    public loadComponent<T>(componentType: Type<T>): Promise<ComponentRef<T>> {
         const factory = this.resolver.resolveComponentFactory(componentType);
         const componentRef = this.containerRef.createComponent(
             factory, this.containerRef.length, this.containerRef.parentInjector);

From 29dc9a24f270039e3f81f3dddcd8e9dd9e4f9c9d Mon Sep 17 00:00:00 2001
From: Svetoslav <tsenov.svetoslav@gmail.com>
Date: Wed, 25 Oct 2017 01:03:43 +0300
Subject: [PATCH 03/26] tests: update mapping of elements in ngForOf scenario
 for ios (#1054)

---
 e2e/renderer/e2e/ngforof.e2e-spec.ts | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/e2e/renderer/e2e/ngforof.e2e-spec.ts b/e2e/renderer/e2e/ngforof.e2e-spec.ts
index 23f6b0eee..e82406777 100644
--- a/e2e/renderer/e2e/ngforof.e2e-spec.ts
+++ b/e2e/renderer/e2e/ngforof.e2e-spec.ts
@@ -12,7 +12,8 @@ interface ElementTuple {
     button: UIElement,
 }
 
-describe("ngForOf scenario", () => {
+describe("ngForOf scenario", function () {
+    this.retries(2);
     let driver: AppiumDriver;
     let addButton: UIElement;
     let removeButton: UIElement;
@@ -94,7 +95,11 @@ describe("ngForOf scenario", () => {
             await button.click();
         } else {
             index = elements.length - 1;
-            await removeButton.click();
+            if (driver.platformName.toLowerCase().includes("ios")) {
+                await removeButton.tap();
+            } else {
+                await removeButton.click();
+            }
         }
 
         elements.splice(index, 1);
@@ -135,11 +140,22 @@ describe("ngForOf scenario", () => {
     };
 
     const getElement = async (id: number) => {
-        const label = await driver.findElementByText(
-            "label: " + id.toString(), SearchOptions.exact);
+        let label = null;
+        let button = null;
+        
+        if (driver.platformName.toLowerCase().includes("ios")) {
+            label = await driver.findElementByAccessibilityId(
+                "label: " + id.toString());
+
+            button = await driver.findElementByAccessibilityId(
+                id.toString());
+        } else {
+            label = await driver.findElementByText(
+                "label: " + id.toString(), SearchOptions.exact);
 
-        const button = await driver.findElementByText(
-            id.toString(), SearchOptions.exact);
+            button = await driver.findElementByText(
+                id.toString(), SearchOptions.exact);
+        }
 
         return { label, button };
     };

From b297ef905736f3a11ed766326ff14d5fab3d9a80 Mon Sep 17 00:00:00 2001
From: Vasil Chimev <Vasil.Chimev@telerik.com>
Date: Wed, 25 Oct 2017 10:31:10 +0300
Subject: [PATCH 04/26] chore: bump version of tns-core-modules peer dep
 (#1055)

---
 nativescript-angular/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nativescript-angular/package.json b/nativescript-angular/package.json
index adce98011..1a2c5fa01 100644
--- a/nativescript-angular/package.json
+++ b/nativescript-angular/package.json
@@ -51,7 +51,7 @@
     "@angular/platform-browser": "~4.4.1",
     "@angular/router": "~4.4.1",
     "rxjs": "^5.0.1",
-    "tns-core-modules": "^3.1.0 || >3.3.0-",
+    "tns-core-modules": "^3.1.0 || >3.4.0-",
     "zone.js": "^0.8.4"
   },
   "devDependencies": {

From 9d92f686cad45f6e95ae0e8873aa09822e0eb27c Mon Sep 17 00:00:00 2001
From: Stanimira Vlaeva <stanimira.vlaeva@gmail.com>
Date: Wed, 1 Nov 2017 18:58:16 +0200
Subject: [PATCH 05/26] refactor: log uptime when Angular Bootstrap finished
 (#1067)

---
 nativescript-angular/platform-common.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nativescript-angular/platform-common.ts b/nativescript-angular/platform-common.ts
index a5fbb67e1..53c66a304 100644
--- a/nativescript-angular/platform-common.ts
+++ b/nativescript-angular/platform-common.ts
@@ -6,7 +6,7 @@ import "./zone-js/dist/zone-nativescript";
 import "reflect-metadata";
 import "./polyfills/array";
 import "./polyfills/console";
-import { profile } from "tns-core-modules/profiling";
+import { profile, log, uptime } from "tns-core-modules/profiling";
 
 import {
     Type,
@@ -187,7 +187,7 @@ export class NativeScriptPlatformRef extends PlatformRef {
                         "nativescript-angular/platform-common.postBootstrapAction";
                     bootstrapAction().then(profile(bootstrapMethodName, moduleRef => {
                         // profiling.stop("ng-bootstrap");
-                        rendererLog("ANGULAR BOOTSTRAP DONE.");
+                        log(`ANGULAR BOOTSTRAP DONE. ${uptime()}`);
                         lastBootstrappedModule = new WeakRef(moduleRef);
 
                         if (resolve) {

From e7229f7f36fda0f2d370b2016770f13da8ea1969 Mon Sep 17 00:00:00 2001
From: Stanimira Vlaeva <stanimira.vlaeva@gmail.com>
Date: Fri, 3 Nov 2017 11:12:38 +0200
Subject: [PATCH 06/26] docs(CHANGELOG): add note about Angular 4 support

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2976d0082..36715dafd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 <a name="4.4.1"></a>
 # [4.4.1](https://github.com/NativeScript/nativescript-angular/compare/4.4.0...4.4.1) (2017-10-13)
-
+> This is the last version of NativeScript Angular that supports Angular 4.
 
 ### Bug Fixes
 

From ea84027a2c2106103652f3ad4a2d1cc2eca196b0 Mon Sep 17 00:00:00 2001
From: Alexander Djenkov <djenkov@progress.com>
Date: Thu, 2 Nov 2017 13:42:32 +0200
Subject: [PATCH 07/26] refactor: Remove ChangeDetectorRef parameter

reason: https://github.com/angular/angular/pull/14311
---
 nativescript-angular/directives/list-view-comp.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/nativescript-angular/directives/list-view-comp.ts b/nativescript-angular/directives/list-view-comp.ts
index 351441cce..7cba54526 100644
--- a/nativescript-angular/directives/list-view-comp.ts
+++ b/nativescript-angular/directives/list-view-comp.ts
@@ -88,15 +88,14 @@ export class ListViewComponent implements DoCheck, OnDestroy, AfterContentInit {
         }
         if (needDiffer && !this._differ && isListLikeIterable(value)) {
             this._differ = this._iterableDiffers.find(this._items)
-                .create(this._cdr, (_index, item) => { return item; });
+                .create((_index, item) => { return item; });
         }
 
         this.listView.items = this._items;
     }
 
     constructor(_elementRef: ElementRef,
-        private _iterableDiffers: IterableDiffers,
-        private _cdr: ChangeDetectorRef) {
+        private _iterableDiffers: IterableDiffers) {
         this.listView = _elementRef.nativeElement;
 
         this.listView.on("itemLoading", this.onItemLoading, this);

From 2243b429f05da297840bcd386983f301e5d8a915 Mon Sep 17 00:00:00 2001
From: Alexander Djenkov <djenkov@progress.com>
Date: Thu, 2 Nov 2017 13:45:27 +0200
Subject: [PATCH 08/26] refactor: implement AnimationDriver (WIP)

---
 nativescript-angular/animations/animation-driver.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nativescript-angular/animations/animation-driver.ts b/nativescript-angular/animations/animation-driver.ts
index 369450208..29eae6f9e 100644
--- a/nativescript-angular/animations/animation-driver.ts
+++ b/nativescript-angular/animations/animation-driver.ts
@@ -68,6 +68,10 @@ class Selector {
 }
 
 export class NativeScriptAnimationDriver implements AnimationDriver {
+    validateStyleProperty(prop: string): boolean {
+        throw new Error("Not implemented!");
+    }
+
     matchesElement(element: NgView, rawSelector: string): boolean {
         traceLog(
             `NativeScriptAnimationDriver.matchesElement ` +

From f325b9bdd2fa3a4fd8a45130ab7f9e3cabc7db22 Mon Sep 17 00:00:00 2001
From: Alexander Djenkov <djenkov@progress.com>
Date: Thu, 2 Nov 2017 13:49:14 +0200
Subject: [PATCH 09/26] refactor: Remove NSFileSystem injection (WIP)

---
 nativescript-angular/resource-loader.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/nativescript-angular/resource-loader.ts b/nativescript-angular/resource-loader.ts
index 43a5091bc..10c1ee759 100644
--- a/nativescript-angular/resource-loader.ts
+++ b/nativescript-angular/resource-loader.ts
@@ -12,8 +12,12 @@ const extensionsFallbacks = [
 
 @Injectable()
 export class FileSystemResourceLoader extends ResourceLoader {
-    constructor(private fs: NSFileSystem) {
+    fs: NSFileSystem;
+
+    constructor() {
         super();
+
+        this.fs = new NSFileSystem();
     }
 
     get(url: string): Promise<string> {
@@ -57,7 +61,7 @@ export class FileSystemResourceLoader extends ResourceLoader {
         const candidates = extensionsFallbacks
             .filter(([extension]) => url.endsWith(extension))
             .map(([extension, fallback]) =>
-                 this.replaceExtension(url, extension, fallback));
+                this.replaceExtension(url, extension, fallback));
 
         const resource = candidates.find(candidate => this.fs.fileExists(candidate));
 

From 9b836871c0c2371568ac9358c8168fd4a1fab2bd Mon Sep 17 00:00:00 2001
From: Alexander Djenkov <djenkov@progress.com>
Date: Thu, 2 Nov 2017 13:52:30 +0200
Subject: [PATCH 10/26] refactor: Use StaticProvider instead of Provider

reason: https://github.com/angular/angular/commit/fcadbf4
---
 nativescript-angular/platform-common.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/nativescript-angular/platform-common.ts b/nativescript-angular/platform-common.ts
index 53c66a304..3495cf0e4 100644
--- a/nativescript-angular/platform-common.ts
+++ b/nativescript-angular/platform-common.ts
@@ -18,7 +18,8 @@ import {
     EventEmitter,
     Provider,
     Sanitizer,
-    InjectionToken
+    InjectionToken,
+    StaticProvider
 } from "@angular/core";
 import { DOCUMENT } from "@angular/common";
 
@@ -54,7 +55,7 @@ export interface AppOptions {
     startPageActionBarHidden?: boolean;
 }
 
-export type PlatformFactory = (extraProviders?: Provider[]) => PlatformRef;
+export type PlatformFactory = (extraProviders?: StaticProvider[]) => PlatformRef;
 
 export class NativeScriptSanitizer extends Sanitizer {
     sanitize(_context: any, value: string): string {
@@ -70,8 +71,8 @@ export class NativeScriptDocument {
 
 export const COMMON_PROVIDERS = [
     defaultPageFactoryProvider,
-    { provide: Sanitizer, useClass: NativeScriptSanitizer },
-    { provide: DOCUMENT, useClass: NativeScriptDocument },
+    { provide: Sanitizer, useClass: NativeScriptSanitizer, deps: [] },
+    { provide: DOCUMENT, useClass: NativeScriptDocument, deps: [] },
 ];
 
 export class NativeScriptPlatformRef extends PlatformRef {

From 0c1c7ee985d6bea0e6eacce8e069b506c9ed0db4 Mon Sep 17 00:00:00 2001
From: Alexander Djenkov <djenkov@progress.com>
Date: Thu, 2 Nov 2017 14:06:55 +0200
Subject: [PATCH 11/26] refactor(platform): Use new Angular APIs

- import platformCoreDynamic from @angular/platform-browser-dynamic
- import INTERNAL_BROWSER_PLATFORM_PROVIDERS (COMPILER_PROVIDERS) from @angular/platform-browser
---
 nativescript-angular/platform.ts | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/nativescript-angular/platform.ts b/nativescript-angular/platform.ts
index f1a6ad80b..0d3075109 100644
--- a/nativescript-angular/platform.ts
+++ b/nativescript-angular/platform.ts
@@ -9,17 +9,24 @@ import {
 import {
     ElementSchemaRegistry,
     ResourceLoader,
-    COMPILER_PROVIDERS,
-    platformCoreDynamic
 } from "@angular/compiler";
 
+import {
+    ɵplatformCoreDynamic as platformCoreDynamic
+} from "@angular/platform-browser-dynamic";
+
+import {
+    ɵINTERNAL_BROWSER_PLATFORM_PROVIDERS as INTERNAL_BROWSER_PLATFORM_PROVIDERS
+} from "@angular/platform-browser";
+
 import {
     COMPILER_OPTIONS,
     PlatformRef,
     InjectionToken,
     ViewEncapsulation,
     createPlatformFactory,
-    MissingTranslationStrategy
+    MissingTranslationStrategy,
+    StaticProvider,
 } from "@angular/core";
 
 // Work around a TS bug requiring an imports of
@@ -39,7 +46,7 @@ import { NSFileSystem } from "./file-system/ns-file-system";
 import { FileSystemResourceLoader } from "./resource-loader";
 
 export const NS_COMPILER_PROVIDERS = [
-    COMPILER_PROVIDERS,
+    INTERNAL_BROWSER_PLATFORM_PROVIDERS,
     {
         provide: COMPILER_OPTIONS,
         useValue: {

From 8b524a8994d50a630ecdbdfb329a2577672e5058 Mon Sep 17 00:00:00 2001
From: Alexander Djenkov <djenkov@progress.com>
Date: Thu, 2 Nov 2017 14:11:11 +0200
Subject: [PATCH 12/26] =?UTF-8?q?refactor:=20Implement=20=C9=B5DomAdapter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

reason: https://github.com/angular/angular/commit/2f2d5f3
---
 nativescript-angular/dom-adapter.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nativescript-angular/dom-adapter.ts b/nativescript-angular/dom-adapter.ts
index e228f92a5..2a112782f 100644
--- a/nativescript-angular/dom-adapter.ts
+++ b/nativescript-angular/dom-adapter.ts
@@ -143,6 +143,7 @@ export class NativeScriptDomAdapter implements ɵDomAdapter {
   templateAwareRoot(_el: any /** TODO #9100 */): any /** TODO #9100 */ { throw new Error("Not implemented!") }
   createHtmlDocument(): HTMLDocument { throw new Error("Not implemented!") }
   defaultDoc(): HTMLDocument { throw new Error("Not implemented!") }
+  getDefaultDocument(): Document { throw new Error("Not implemented!") }
   getBoundingClientRect(_el: any /** TODO #9100 */): any /** TODO #9100 */ { throw new Error("Not implemented!") }
   getTitle(): string { throw new Error("Not implemented!") }
   setTitle(_doc: Document, _newTitle: string): any /** TODO #9100 */ { throw new Error("Not implemented!") }

From 13ad80c75d35c314b1049dae00996a4150911cb7 Mon Sep 17 00:00:00 2001
From: Alexander Djenkov <djenkov@progress.com>
Date: Thu, 2 Nov 2017 14:27:49 +0200
Subject: [PATCH 13/26] refactor: Stop using private APIs to retrieve activated
 route roiteConfig property

---
 nativescript-angular/router/page-router-outlet.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/nativescript-angular/router/page-router-outlet.ts b/nativescript-angular/router/page-router-outlet.ts
index 2695026c4..3737dd7d5 100644
--- a/nativescript-angular/router/page-router-outlet.ts
+++ b/nativescript-angular/router/page-router-outlet.ts
@@ -359,13 +359,11 @@ export class PageRouterOutlet implements OnDestroy, OnInit { // tslint:disable-l
         log("Activated route marked as page: " + routeToString(nodeToMark));
     }
 
-    // NOTE: Using private APIs - potential break point!
     private getComponentFactory(
-        activatedRoute: any,
+        activatedRoute: ActivatedRoute,
         loadedResolver: ComponentFactoryResolver
     ): ComponentFactory<any> {
-        const snapshot = activatedRoute._futureSnapshot;
-        const component = <any>snapshot._routeConfig.component;
+        const { component } = activatedRoute.routeConfig;
 
         return loadedResolver ?
             loadedResolver.resolveComponentFactory(component) :

From efbc2f501d6a0a5534984d30c86641aa1f407245 Mon Sep 17 00:00:00 2001
From: Alexander Djenkov <djenkov@progress.com>
Date: Thu, 2 Nov 2017 14:33:30 +0200
Subject: [PATCH 14/26] refactor: Remove NSFileSystem provider. Add deps
 property for ResourceLoader and ElementSchemaRegistry providers.

reason:https://github.com/angular/angular/commit/fcadbf4
---
 nativescript-angular/platform.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/nativescript-angular/platform.ts b/nativescript-angular/platform.ts
index 0d3075109..6f259abf5 100644
--- a/nativescript-angular/platform.ts
+++ b/nativescript-angular/platform.ts
@@ -51,9 +51,8 @@ export const NS_COMPILER_PROVIDERS = [
         provide: COMPILER_OPTIONS,
         useValue: {
             providers: [
-                NSFileSystem,
-                { provide: ResourceLoader, useClass: FileSystemResourceLoader },
-                { provide: ElementSchemaRegistry, useClass: NativeScriptElementSchemaRegistry },
+                { provide: ResourceLoader, useClass: FileSystemResourceLoader, deps: [] },
+                { provide: ElementSchemaRegistry, useClass: NativeScriptElementSchemaRegistry, deps: [] },
             ]
         },
         multi: true

From 7d4878eda842f41c9e53f902ff5e7a77d15cfc97 Mon Sep 17 00:00:00 2001
From: Alexander Djenkov <djenkov@progress.com>
Date: Thu, 2 Nov 2017 14:43:28 +0200
Subject: [PATCH 15/26] chore: Add @angular/platform-browse-dynamic dependency
 and bump version of @angular/... peer and dev deps

---
 nativescript-angular/package.json | 42 ++++++++++++++++---------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/nativescript-angular/package.json b/nativescript-angular/package.json
index 1a2c5fa01..de5784b9e 100644
--- a/nativescript-angular/package.json
+++ b/nativescript-angular/package.json
@@ -43,32 +43,34 @@
     "reflect-metadata": "^0.1.8"
   },
   "peerDependencies": {
-    "@angular/common": "~4.4.1",
-    "@angular/compiler": "~4.4.1",
-    "@angular/core": "~4.4.1",
-    "@angular/forms": "~4.4.1",
-    "@angular/http": "~4.4.1",
-    "@angular/platform-browser": "~4.4.1",
-    "@angular/router": "~4.4.1",
-    "rxjs": "^5.0.1",
+    "@angular/platform-browser-dynamic": "~5.0.0",
+    "@angular/common": "~5.0.0",
+    "@angular/compiler": "~5.0.0",
+    "@angular/core": "~5.0.0",
+    "@angular/forms": "~5.0.0",
+    "@angular/http": "~5.0.0",
+    "@angular/platform-browser": "~5.0.0",
+    "@angular/router": "~5.0.0",
+    "rxjs": "^5.5.0",
     "tns-core-modules": "^3.1.0 || >3.4.0-",
     "zone.js": "^0.8.4"
   },
   "devDependencies": {
-    "@angular/animations": "~4.4.1",
-    "@angular/common": "~4.4.1",
-    "@angular/compiler": "~4.4.1",
-    "@angular/compiler-cli": "~4.4.1",
-    "@angular/core": "~4.4.1",
-    "@angular/forms": "~4.4.1",
-    "@angular/http": "~4.4.1",
-    "@angular/platform-browser": "~4.4.1",
-    "@angular/router": "~4.4.1",
-    "codelyzer": "^3.1.2",
-    "rxjs": "^5.4.2",
+    "@angular/platform-browser-dynamic": "~5.0.0",
+    "@angular/animations": "~5.0.0",
+    "@angular/common": "~5.0.0",
+    "@angular/compiler": "~5.0.0",
+    "@angular/compiler-cli": "~5.0.0",
+    "@angular/core": "~5.0.0",
+    "@angular/forms": "~5.0.0",
+    "@angular/http": "~5.0.0",
+    "@angular/platform-browser": "~5.0.0",
+    "@angular/router": "~5.0.0",
+    "codelyzer": "^4.0.0",
+    "rxjs": "^5.5.0",
     "tns-core-modules": "next",
     "tslint": "^5.5.0",
-    "typescript": "^2.5.1",
+    "typescript": "~2.4.2",
     "zone.js": "^0.8.12"
   }
 }

From 105c9375f14b5e5f69a6ff215fd061ce1488fdef Mon Sep 17 00:00:00 2001
From: Alexander Djenkov <djenkov@progress.com>
Date: Thu, 2 Nov 2017 15:51:27 +0200
Subject: [PATCH 16/26] chore: Add typescript peer dep

---
 nativescript-angular/package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nativescript-angular/package.json b/nativescript-angular/package.json
index de5784b9e..719a0c68d 100644
--- a/nativescript-angular/package.json
+++ b/nativescript-angular/package.json
@@ -53,7 +53,8 @@
     "@angular/router": "~5.0.0",
     "rxjs": "^5.5.0",
     "tns-core-modules": "^3.1.0 || >3.4.0-",
-    "zone.js": "^0.8.4"
+    "zone.js": "^0.8.4",
+    "typescript": "~2.4.2"
   },
   "devDependencies": {
     "@angular/platform-browser-dynamic": "~5.0.0",

From 8e474ad9a9ba363981f635c2e06ff6ab08866220 Mon Sep 17 00:00:00 2001
From: Alexander Djenkov <djenkov@progress.com>
Date: Thu, 2 Nov 2017 15:51:53 +0200
Subject: [PATCH 17/26] chore: Update e2e apps deps

---
 e2e/renderer/package.json | 25 +++++++++++++------------
 e2e/router/package.json   | 30 ++++++++++++++++--------------
 2 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/e2e/renderer/package.json b/e2e/renderer/package.json
index 94403d63c..5edac50fa 100644
--- a/e2e/renderer/package.json
+++ b/e2e/renderer/package.json
@@ -10,20 +10,20 @@
     }
   },
   "dependencies": {
-    "@angular/animations": "~4.4.1",
-    "@angular/common": "~4.4.1",
-    "@angular/compiler": "~4.4.1",
-    "@angular/core": "~4.4.1",
-    "@angular/forms": "~4.4.1",
-    "@angular/http": "~4.4.1",
-    "@angular/platform-browser": "~4.4.1",
-    "@angular/router": "~4.4.1",
+    "@angular/common": "~5.0.0",
+    "@angular/compiler": "~5.0.0",
+    "@angular/core": "~5.0.0",
+    "@angular/forms": "~5.0.0",
+    "@angular/http": "~5.0.0",
+    "@angular/platform-browser": "~5.0.0",
+    "@angular/platform-browser-dynamic": "~5.0.0",
+    "@angular/router": "~5.0.0",
     "nativescript-angular": "file:../../nativescript-angular",
     "nativescript-intl": "^3.0.0",
     "reflect-metadata": "~0.1.8",
-    "rxjs": "~5.3.0",
+    "rxjs": "^5.5.0",
     "tns-core-modules": "next",
-    "zone.js": "~0.8.2"
+    "zone.js": "^0.8.4"
   },
   "devDependencies": {
     "@types/chai": "^4.0.2",
@@ -42,10 +42,11 @@
     "nativescript-dev-appium": "next",
     "nativescript-dev-typescript": "~0.4.0",
     "tslib": "^1.7.1",
-    "typescript": "~2.2.1"
+    "typescript": "~2.4.2"
   },
   "scripts": {
     "e2e": "tsc -p e2e && mocha --opts ./e2e/config/mocha.opts",
-    "compile-tests-w": "tsc -p e2e --watch"
+    "compile-tests-w": "tsc -p e2e --watch",
+    "update-app-ng-deps": "update-app-ng-deps"
   }
 }
diff --git a/e2e/router/package.json b/e2e/router/package.json
index e99f48117..04c9aa423 100644
--- a/e2e/router/package.json
+++ b/e2e/router/package.json
@@ -6,27 +6,28 @@
   "nativescript": {
     "id": "org.nativescript.router",
     "tns-android": {
-      "version": "3.2.0-2017-9-4-1"
+      "version": "next"
     },
     "tns-ios": {
-      "version": "3.2.0"
+      "version": "next"
     }
   },
   "dependencies": {
     "@angular/animations": "~4.4.1",
-    "@angular/common": "~4.4.1",
-    "@angular/compiler": "~4.4.1",
-    "@angular/core": "~4.4.1",
-    "@angular/forms": "~4.4.1",
-    "@angular/http": "~4.4.1",
-    "@angular/platform-browser": "~4.4.1",
-    "@angular/router": "~4.4.1",
+    "@angular/common": "~5.0.0",
+    "@angular/compiler": "~5.0.0",
+    "@angular/core": "~5.0.0",
+    "@angular/forms": "~5.0.0",
+    "@angular/http": "~5.0.0",
+    "@angular/platform-browser": "~5.0.0",
+    "@angular/router": "~5.0.0",
     "nativescript-angular": "file:../../nativescript-angular",
     "nativescript-intl": "^3.0.0",
     "reflect-metadata": "~0.1.8",
-    "rxjs": "~5.3.0",
+    "rxjs": "^5.5.0",
     "tns-core-modules": "next",
-    "zone.js": "~0.8.2"
+    "zone.js": "^0.8.4",
+    "@angular/platform-browser-dynamic": "~5.0.0"
   },
   "devDependencies": {
     "@types/chai": "^4.0.2",
@@ -45,10 +46,11 @@
     "nativescript-dev-appium": "next",
     "nativescript-dev-typescript": "~0.4.0",
     "tslib": "^1.7.1",
-    "typescript": "~2.2.1"
+    "typescript": "~2.4.2"
   },
   "scripts": {
     "e2e": "tsc -p e2e && mocha --opts ./e2e/config/mocha.opts",
-    "compile-tests-w": "tsc -p e2e --watch"
+    "compile-tests-w": "tsc -p e2e --watch",
+    "update-app-ng-deps": "update-app-ng-deps"
   }
-}
+}
\ No newline at end of file

From ff16d106d0e75b91b6f001b1d62c7a0108f31194 Mon Sep 17 00:00:00 2001
From: Alexander Djenkov <djenkov@progress.com>
Date: Thu, 2 Nov 2017 15:54:03 +0200
Subject: [PATCH 18/26] refactor: Update update-app-ng-deps script

- Update dev deps
- Add new deps in deps
- Update to work with NPM5
---
 nativescript-angular/bin/update-app-ng-deps | 41 +++++++--------------
 1 file changed, 14 insertions(+), 27 deletions(-)

diff --git a/nativescript-angular/bin/update-app-ng-deps b/nativescript-angular/bin/update-app-ng-deps
index 7676e3313..1cf6786ce 100644
--- a/nativescript-angular/bin/update-app-ng-deps
+++ b/nativescript-angular/bin/update-app-ng-deps
@@ -11,47 +11,34 @@ const pluginPackageJson = JSON.parse(fs.readFileSync(pluginPackageJsonPath, "utf
 
 const isNgDependency = name => name.startsWith("@angular") ||
     name === "rxjs" ||
-    name === "zone.js";
+    name === "zone.js" ||
+    name === "typescript";
 
-function updateDeps(deps, newDeps) {
-    // set app dependencies to ones required from plugin
+function updateDeps(deps, devDeps, newDeps) {
     Object.keys(newDeps)
         .filter(isNgDependency)
-        .filter(dependencyName => deps.hasOwnProperty(dependencyName))
         .map(dependencyName => ({
             dependencyName,
-            version: pluginPackageJson.peerDependencies[dependencyName]
+            version: newDeps[dependencyName]
         }))
-        .filter(({ dependencyName, version }) => deps[dependencyName] !== version)
         .forEach(({ dependencyName, version }) => {
-            deps[dependencyName] = version;
+            if (devDeps[dependencyName]) {
+                devDeps[dependencyName] = version;
+            } else {
+                deps[dependencyName] = version;
+            }
+
             console.log(`Updated dependency ${dependencyName} to version: ${version}.`);
         });
-    
-    // remove platform-browser-dynamic if present
-    if (deps.hasOwnProperty(browserDynamicDependency)) {
-        delete deps[browserDynamicDependency];
-        console.log(`Removed ${browserDynamicDependency}`);
-    }
-
-
-    return deps;
 }
 
-let pluginDeps = pluginPackageJson.peerDependencies;
-Object.keys(pluginPackageJson.devDependencies)
-    .filter(isNgDependency)
-    .filter(depName => !pluginDeps.hasOwnProperty(depName))
-    .forEach(depName => {
-        pluginDeps[depName] = pluginPackageJson.devDependencies[depName];
-    });
-
-const projectPath = path.dirname(path.dirname(pluginPath));
+const pluginDeps = pluginPackageJson.peerDependencies;
+const projectPath = process.env.INIT_CWD || path.dirname(path.dirname(pluginPath));
 const appPackageJsonPath = path.join(projectPath, "package.json");
 const appPackageJson = JSON.parse(fs.readFileSync(appPackageJsonPath, "utf8"));
 
-appPackageJson.dependencies = updateDeps(appPackageJson.dependencies, pluginDeps);
-appPackageJson.devDependencies = updateDeps(appPackageJson.devDependencies, pluginDeps);
+const { dependencies, devDependencies } = appPackageJson;
+updateDeps(dependencies, devDependencies, pluginDeps);
 
 fs.writeFileSync(appPackageJsonPath, JSON.stringify(appPackageJson, null, 2));
 

From 5a2690be2c43c573bd2de387b3a3dd28a630975f Mon Sep 17 00:00:00 2001
From: Alexander Djenkov <djenkov@progress.com>
Date: Thu, 2 Nov 2017 16:54:17 +0200
Subject: [PATCH 19/26] fix:tslint errors

---
 nativescript-angular/directives/list-view-comp.ts | 1 -
 nativescript-angular/platform-common.ts           | 1 -
 nativescript-angular/platform.ts                  | 3 +--
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/nativescript-angular/directives/list-view-comp.ts b/nativescript-angular/directives/list-view-comp.ts
index 7cba54526..a04f244b4 100644
--- a/nativescript-angular/directives/list-view-comp.ts
+++ b/nativescript-angular/directives/list-view-comp.ts
@@ -1,7 +1,6 @@
 import {
     AfterContentInit,
     ChangeDetectionStrategy,
-    ChangeDetectorRef,
     Component,
     ContentChild,
     Directive,
diff --git a/nativescript-angular/platform-common.ts b/nativescript-angular/platform-common.ts
index 3495cf0e4..19bd05efc 100644
--- a/nativescript-angular/platform-common.ts
+++ b/nativescript-angular/platform-common.ts
@@ -16,7 +16,6 @@ import {
     NgModuleFactory,
     NgModuleRef,
     EventEmitter,
-    Provider,
     Sanitizer,
     InjectionToken,
     StaticProvider
diff --git a/nativescript-angular/platform.ts b/nativescript-angular/platform.ts
index 6f259abf5..03633089f 100644
--- a/nativescript-angular/platform.ts
+++ b/nativescript-angular/platform.ts
@@ -42,10 +42,9 @@ if ((<any>global).___TS_UNUSED) {
 import "./dom-adapter";
 
 import { NativeScriptElementSchemaRegistry } from "./schema-registry";
-import { NSFileSystem } from "./file-system/ns-file-system";
 import { FileSystemResourceLoader } from "./resource-loader";
 
-export const NS_COMPILER_PROVIDERS = [
+export const NS_COMPILER_PROVIDERS: StaticProvider[] = [
     INTERNAL_BROWSER_PLATFORM_PROVIDERS,
     {
         provide: COMPILER_OPTIONS,

From 8a147dd580fdbbc61847e023797a855d198f7fbf Mon Sep 17 00:00:00 2001
From: Alexander Djenkov <djenkov@progress.com>
Date: Thu, 2 Nov 2017 17:49:51 +0200
Subject: [PATCH 20/26] refactor: Replace OpaqueToken with InjectionToken since
 it's removed from @angular/core

---
 tests/app/base.component.ts | 4 ++--
 tests/app/main.ts           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/app/base.component.ts b/tests/app/base.component.ts
index 6909d5921..2ca048204 100644
--- a/tests/app/base.component.ts
+++ b/tests/app/base.component.ts
@@ -1,5 +1,5 @@
-import { OpaqueToken, OnInit, OnDestroy } from "@angular/core";
-export const HOOKS_LOG = new OpaqueToken("Hooks log");
+import { InjectionToken, OnInit, OnDestroy } from "@angular/core";
+export const HOOKS_LOG = new InjectionToken("Hooks log");
 import { BehaviorSubject } from "rxjs/BehaviorSubject";
 
 export class BaseComponent implements OnInit, OnDestroy {
diff --git a/tests/app/main.ts b/tests/app/main.ts
index ce33b3f50..f5c652ff7 100644
--- a/tests/app/main.ts
+++ b/tests/app/main.ts
@@ -24,7 +24,7 @@ import { SinglePageMain, routes as singlePageRoutes } from "./single-page-main.c
 import { LazyLoadMain, routes as lazyLoadRoutes } from "./lazy-load-main";
 import { FirstComponent } from "./first.component";
 import { SecondComponent } from "./second.component";
-import { OpaqueToken, NgModule, NgModuleFactoryLoader } from "@angular/core";
+import { InjectionToken, NgModule, NgModuleFactoryLoader } from "@angular/core";
 
 import { PageNavigationApp } from "./snippets/navigation/page-outlet";
 import { NavigationApp } from "./snippets/navigation/router-outlet";

From fd1c188947bfbb46876418e246c9797957598705 Mon Sep 17 00:00:00 2001
From: Alexander Djenkov <djenkov@progress.com>
Date: Thu, 2 Nov 2017 17:50:45 +0200
Subject: [PATCH 21/26] chore: Update tests app deps

---
 tests/package.json | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/tests/package.json b/tests/package.json
index 9cfb0bb66..38bef7bb7 100644
--- a/tests/package.json
+++ b/tests/package.json
@@ -27,19 +27,19 @@
   "homepage": "http://nativescript.org",
   "dependencies": {
     "@angular/animations": "~4.4.1",
-    "@angular/common": "~4.4.1",
-    "@angular/compiler": "~4.4.1",
-    "@angular/core": "~4.4.1",
-    "@angular/forms": "~4.4.1",
-    "@angular/http": "~4.4.1",
-    "@angular/platform-browser": "~4.4.1",
-    "@angular/platform-browser-dynamic": "~4.4.1",
-    "@angular/router": "~4.4.1",
+    "@angular/common": "~5.0.0",
+    "@angular/compiler": "~5.0.0",
+    "@angular/core": "~5.0.0",
+    "@angular/forms": "~5.0.0",
+    "@angular/http": "~5.0.0",
+    "@angular/platform-browser": "~5.0.0",
+    "@angular/platform-browser-dynamic": "~5.0.0",
+    "@angular/router": "~5.0.0",
     "nativescript-angular": "../nativescript-angular",
     "nativescript-unit-test-runner": "^0.3.4",
-    "rxjs": "^5.2.0",
+    "rxjs": "^5.5.0",
     "tns-core-modules": "next",
-    "zone.js": "^0.8.2"
+    "zone.js": "^0.8.4"
   },
   "devDependencies": {
     "@types/chai": "^4.0.2",
@@ -66,11 +66,12 @@
     "socket.io-client": "1.4.8",
     "tslib": "^1.7.1",
     "tslint": "^4.5.1",
-    "typescript": "~2.5.0",
+    "typescript": "~2.4.2",
     "mocha": "~3.5.0"
   },
   "scripts": {
     "e2e": "tsc -p e2e && mocha --opts ./e2e/config/mocha.opts",
-    "compile-tests-w": "tsc -p e2e --watch"
+    "compile-tests-w": "tsc -p e2e --watch",
+    "update-app-ng-deps": "update-app-ng-deps"
   }
 }

From 63f2532838fc7b3f4875f28d641cfe15eeaf8f57 Mon Sep 17 00:00:00 2001
From: Alexander Djenkov <djenkov@progress.com>
Date: Thu, 2 Nov 2017 17:52:01 +0200
Subject: [PATCH 22/26] refactor: FileSystemResourceLoader now inits
 NSFileSystemMock internally (WIP)

---
 tests/app/tests/xhr-paths.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/app/tests/xhr-paths.ts b/tests/app/tests/xhr-paths.ts
index c3de6a6dc..818d59e17 100644
--- a/tests/app/tests/xhr-paths.ts
+++ b/tests/app/tests/xhr-paths.ts
@@ -25,7 +25,8 @@ const fsMock = new NSFileSystemMock();
 describe("XHR name resolution", () => {
     let resourceLoader: FileSystemResourceLoader;
     before(() => {
-        resourceLoader = new FileSystemResourceLoader(new NSFileSystemMock());
+        resourceLoader = new FileSystemResourceLoader();
+        resourceLoader.fs = new NSFileSystemMock();
     });
 
     it("resolves relative paths from app root", () => {

From c0660cc15c0e42509e9e9f9e0354ae0e2056fbdb Mon Sep 17 00:00:00 2001
From: sis0k0 <stanimira.vlaeva@gmail.com>
Date: Fri, 3 Nov 2017 15:15:57 +0200
Subject: [PATCH 23/26] chore: bump version to publish @next with 5.0

---
 nativescript-angular/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nativescript-angular/package.json b/nativescript-angular/package.json
index 719a0c68d..ebb23d811 100644
--- a/nativescript-angular/package.json
+++ b/nativescript-angular/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "nativescript-angular",
-  "version": "4.4.1",
+  "version": "5.0.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",

From 993543a36ea3309b33a7cb336efdf8d694e7c2c8 Mon Sep 17 00:00:00 2001
From: sis0k0 <stanimira.vlaeva@gmail.com>
Date: Fri, 3 Nov 2017 16:07:23 +0200
Subject: [PATCH 24/26] refactor: use prepare npm hook for ngc compilation and
 metadata cleanup

- metadata will now be shipped with the package
---
 nativescript-angular/bin/remove-polyfills-metadata.js | 5 +++++
 nativescript-angular/package.json                     | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 nativescript-angular/bin/remove-polyfills-metadata.js

diff --git a/nativescript-angular/bin/remove-polyfills-metadata.js b/nativescript-angular/bin/remove-polyfills-metadata.js
new file mode 100644
index 000000000..4c1d4af30
--- /dev/null
+++ b/nativescript-angular/bin/remove-polyfills-metadata.js
@@ -0,0 +1,5 @@
+const { unlinkSync } = require("fs");
+
+unlinkSync("./polyfills/console.metadata.json");
+unlinkSync("./polyfills/array.metadata.json");
+
diff --git a/nativescript-angular/package.json b/nativescript-angular/package.json
index ebb23d811..a60458968 100644
--- a/nativescript-angular/package.json
+++ b/nativescript-angular/package.json
@@ -33,7 +33,7 @@
     "postinstall": "node postinstall.js",
     "tsc": "tsc -p tsconfig.json",
     "ngc": "ngc -p tsconfig.json",
-    "prepublish": "npm run tsc && npm run ngc"
+    "prepare": "npm run ngc && node ./bin/remove-polyfills-metadata.js"
   },
   "bin": {
     "update-app-ng-deps": "./bin/update-app-ng-deps"

From 7af14e68a21ad70d596e0cb4e45a7a0dc4976a5d Mon Sep 17 00:00:00 2001
From: sis0k0 <stanimira.vlaeva@gmail.com>
Date: Fri, 3 Nov 2017 17:11:00 +0200
Subject: [PATCH 25/26] chore: update travis ci to use node-lts (8.9.0)

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 273f0a9c1..e29696cf7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 env:
   global:
-  - NODE_VERSION=6.11.1
+  - NODE_VERSION=8.9.0
   - EMULATOR_API_LEVEL=19
   - ANDROID_VERSION=25
   - ANDROID_BUILD_TOOLS_VERSION=25.0.2

From a3ee0c74df76dfa23b9cdc6532c270aeccbfd3cc Mon Sep 17 00:00:00 2001
From: vchimev <Vasil.Chimev@telerik.com>
Date: Mon, 6 Nov 2017 19:07:20 +0200
Subject: [PATCH 26/26] docs: add changelog for 5.0.0-rc.0

---
 CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 36715dafd..4a35240ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+<a name="5.0.0-rc.0"></a>
+# [5.0.0-rc.0](https://github.com/NativeScript/nativescript-angular/compare/4.4.1...5.0.0-rc.0) (2017-11-06)
+
+### Features
+
+* Initial Angular 5.0 support ([#1073](https://github.com/NativeScript/nativescript-angular/issues/1073))
+
+
+
 <a name="4.4.1"></a>
 # [4.4.1](https://github.com/NativeScript/nativescript-angular/compare/4.4.0...4.4.1) (2017-10-13)
 > This is the last version of NativeScript Angular that supports Angular 4.