From b58d849c88cb4098891f6abfb8707cc352bd48d3 Mon Sep 17 00:00:00 2001
From: ADjenkov <ADjenkov>
Date: Mon, 20 Aug 2018 14:57:28 +0300
Subject: [PATCH 1/2] fix(frame-service): move FrameService provider to
 NativeScriptModule in order to be singleton

---
 nativescript-angular/common.ts              | 2 --
 nativescript-angular/nativescript.module.ts | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nativescript-angular/common.ts b/nativescript-angular/common.ts
index 5e2b78745..c6b119eef 100644
--- a/nativescript-angular/common.ts
+++ b/nativescript-angular/common.ts
@@ -12,7 +12,6 @@ import {
     defaultDeviceProvider,
     defaultFrameProvider,
     defaultPageProvider,
-    FrameService,
 } from "./platform-providers";
 import { NS_DIRECTIVES } from "./directives";
 
@@ -26,7 +25,6 @@ import { NS_DIRECTIVES } from "./directives";
         defaultDeviceProvider,
         defaultFrameProvider,
         defaultPageProvider,
-        FrameService,
     ],
     imports: [
         CommonModule,
diff --git a/nativescript-angular/nativescript.module.ts b/nativescript-angular/nativescript.module.ts
index 489207011..fbcc49c37 100644
--- a/nativescript-angular/nativescript.module.ts
+++ b/nativescript-angular/nativescript.module.ts
@@ -28,6 +28,7 @@ import { NativeScriptCommonModule } from "./common";
 import { NativeScriptRendererFactory } from "./renderer";
 import { DetachedLoader } from "./common/detached-loader";
 import { throwIfAlreadyLoaded } from "./common/utils";
+import { FrameService } from "./platform-providers";
 
 export function errorHandlerFactory() {
     return new ErrorHandler();
@@ -38,6 +39,7 @@ export function errorHandlerFactory() {
         DetachedLoader,
     ],
     providers: [
+        FrameService,
         NativeScriptRendererFactory,
         SystemJsNgModuleLoader,
         { provide: APP_ROOT, useValue: true },

From 021b20eea8e744ed8e451c9cf2e656879b7a22b4 Mon Sep 17 00:00:00 2001
From: ADjenkov <ADjenkov>
Date: Tue, 21 Aug 2018 13:51:39 +0300
Subject: [PATCH 2/2] chore: bump ngtools/webpack version

---
 e2e/single-page/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/e2e/single-page/package.json b/e2e/single-page/package.json
index cd07a15de..0ac534b12 100644
--- a/e2e/single-page/package.json
+++ b/e2e/single-page/package.json
@@ -31,7 +31,7 @@
   },
   "devDependencies": {
     "@angular/compiler-cli": "~6.1.0",
-    "@ngtools/webpack": "~6.1.0",
+    "@ngtools/webpack": "~6.2.0-beta.3",
     "@types/chai": "^4.0.2",
     "@types/mocha": "^2.2.41",
     "@types/node": "^7.0.5",