From d8818c18c0d9437385e4daa878b94254b09453e6 Mon Sep 17 00:00:00 2001
From: Maxime GRIS <maxime.gris@gmail.com>
Date: Sun, 19 Aug 2018 15:06:09 +0200
Subject: [PATCH] Upgrade Angular (6.1.2) deps

---
 .gitignore          |  2 ++
 README.md           |  6 +++---
 main.ts             |  9 ++++++---
 package.json        | 28 ++++++++++++++--------------
 tsconfig-serve.json |  4 +---
 5 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/.gitignore b/.gitignore
index ebae9d98c..5e70f99a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,8 @@
 /app-builds
 /release
 main.js
+src/**/*.js
+*.js.map
 
 # dependencies
 /node_modules
diff --git a/README.md b/README.md
index 473872378..12033945d 100644
--- a/README.md
+++ b/README.md
@@ -15,9 +15,9 @@ Bootstrap and package your project with Angular 6(+) and Electron (Typescript +
 
 Currently runs with:
 
-- Angular v6.0.5
-- Electron v2.0.3
-- Electron Builder v20.13.4
+- Angular v6.1.2
+- Electron v2.0.7
+- Electron Builder v20.28.1
 
 With this sample, you can :
 
diff --git a/main.ts b/main.ts
index 68d810384..1433b7c12 100644
--- a/main.ts
+++ b/main.ts
@@ -2,7 +2,8 @@ import { app, BrowserWindow, screen } from 'electron';
 import * as path from 'path';
 import * as url from 'url';
 
-import {interval} from 'rxjs';
+import { of } from 'rxjs';
+import { timeout } from 'rxjs/operators';
 
 let win, serve;
 const args = process.argv.slice(1);
@@ -23,7 +24,8 @@ function createWindow() {
 
   if (serve) {
     require('electron-reload')(__dirname, {
-     electron: require(`${__dirname}/node_modules/electron`)});
+      electron: require(`${__dirname}/node_modules/electron`)
+    });
     win.loadURL('http://localhost:4200');
   } else {
     win.loadURL(url.format({
@@ -43,7 +45,8 @@ function createWindow() {
     win = null;
   });
 
-  interval(1000).subscribe(val => console.log(`ES5 works fine : @${val}s`));
+  of(2000).pipe(timeout(1000))
+    .subscribe(val => console.log(`ES5 works fine : @${val}`));
 }
 
 try {
diff --git a/package.json b/package.json
index d47a61362..434bb5fa9 100644
--- a/package.json
+++ b/package.json
@@ -40,17 +40,17 @@
   "dependencies": {},
   "devDependencies": {
     "@angular-devkit/build-angular": "0.6.3",
-    "@angular/cli": "6.0.5",
-    "@angular/common": "6.0.5",
-    "@angular/compiler": "6.0.5",
-    "@angular/compiler-cli": "6.0.5",
-    "@angular/core": "6.0.5",
-    "@angular/forms": "6.0.5",
-    "@angular/http": "6.0.5",
-    "@angular/language-service": "6.0.5",
-    "@angular/platform-browser": "6.0.5",
-    "@angular/platform-browser-dynamic": "6.0.5",
-    "@angular/router": "6.0.5",
+    "@angular/cli": "6.1.2",
+    "@angular/common": "6.1.2",
+    "@angular/compiler": "6.1.2",
+    "@angular/compiler-cli": "6.1.2",
+    "@angular/core": "6.1.2",
+    "@angular/forms": "6.1.2",
+    "@angular/http": "6.1.2",
+    "@angular/language-service": "6.1.2",
+    "@angular/platform-browser": "6.1.2",
+    "@angular/platform-browser-dynamic": "6.1.2",
+    "@angular/router": "6.1.2",
     "@ngx-translate/core": "10.0.1",
     "@ngx-translate/http-loader": "3.0.1",
     "@types/jasmine": "2.8.7",
@@ -58,8 +58,8 @@
     "@types/node": "8.9.4",
     "codelyzer": "4.2.1",
     "core-js": "2.5.6",
-    "electron": "2.0.3",
-    "electron-builder": "20.14.7",
+    "electron": "2.0.7",
+    "electron-builder": "20.28.1",
     "electron-reload": "1.2.2",
     "jasmine-core": "3.1.0",
     "jasmine-spec-reporter": "4.2.1",
@@ -71,7 +71,7 @@
     "npm-run-all": "4.1.3",
     "npx": "10.2.0",
     "protractor": "5.3.2",
-    "rxjs": "6.1.0",
+    "rxjs": "6.2.2",
     "ts-node": "6.0.3",
     "tslint": "5.10.0",
     "typescript": "2.7.2",
diff --git a/tsconfig-serve.json b/tsconfig-serve.json
index 8bda27fc7..56d7a0a74 100644
--- a/tsconfig-serve.json
+++ b/tsconfig-serve.json
@@ -17,9 +17,7 @@
     ]
   },
   "include": [
-    "main.ts",
-    "src/**/*",
-    "e2e/**/*"
+    "main.ts"
   ],
   "exclude": [
     "node_modules",