From 10aaa4c9b6b10736c7e830fd7be663ad4e55067f Mon Sep 17 00:00:00 2001 From: Tomoyuki Aota Date: Sat, 26 Jan 2019 02:23:10 +0900 Subject: [PATCH 1/2] Fix Travis CI link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1cdf498..ea3e695 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,7 @@ Note that you can't use Electron or NodeJS native libraries in this case. Please - Angular 7 & Electron 3 : (master) [build-badge]: https://travis-ci.org/maximegris/angular-electron.svg?branch=master -[build]: https://travis-ci.org/maximegris/angular-electron.svg?branch=master +[build]: https://travis-ci.org/maximegris/angular-electron [dependencyci-badge]: https://dependencyci.com/github/maximegris/angular-electron/badge [dependencyci]: https://dependencyci.com/github/maximegris/angular-electron [license-badge]: https://img.shields.io/badge/license-Apache2-blue.svg?style=flat From 07a5786dcc1a2443e189686da7e163d23941bd6e Mon Sep 17 00:00:00 2001 From: Thibaut Lassalle Date: Wed, 27 Feb 2019 16:44:01 -0500 Subject: [PATCH 2/2] update versions and prepare for electron 5 --- main.ts | 5 ++++- package.json | 28 ++++++++++++++-------------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/main.ts b/main.ts index 44f897b..b5a3ebc 100644 --- a/main.ts +++ b/main.ts @@ -16,7 +16,10 @@ function createWindow() { x: 0, y: 0, width: size.width, - height: size.height + height: size.height, + webPreferences: { + nodeIntegration: true, + }, }); if (serve) { diff --git a/package.json b/package.json index 21869a2..5566db9 100644 --- a/package.json +++ b/package.json @@ -40,17 +40,17 @@ "dependencies": {}, "devDependencies": { "@angular-devkit/build-angular": "0.12.1", - "@angular/cli": "7.2.1", - "@angular/common": "7.2.0", - "@angular/compiler": "7.2.0", - "@angular/compiler-cli": "7.2.0", - "@angular/core": "7.2.0", - "@angular/forms": "7.2.0", - "@angular/http": "7.2.0", - "@angular/language-service": "7.2.0", - "@angular/platform-browser": "7.2.0", - "@angular/platform-browser-dynamic": "7.2.0", - "@angular/router": "7.2.0", + "@angular/cli": "7.3.3", + "@angular/common": "7.2.7", + "@angular/compiler": "7.2.7", + "@angular/compiler-cli": "7.2.7", + "@angular/core": "7.2.7", + "@angular/forms": "7.2.7", + "@angular/http": "7.2.7", + "@angular/language-service": "7.2.7", + "@angular/platform-browser": "7.2.7", + "@angular/platform-browser-dynamic": "7.2.7", + "@angular/router": "7.2.7", "@ngx-translate/core": "11.0.1", "@ngx-translate/http-loader": "4.0.0", "@types/jasmine": "2.8.7", @@ -71,12 +71,12 @@ "karma-jasmine-html-reporter": "1.4.0", "npm-run-all": "4.1.5", "protractor": "5.4.1", - "rxjs": "6.3.3", + "rxjs": "6.4.0", "ts-node": "7.0.1", "tslint": "5.11.0", - "typescript": "3.2.2", + "typescript": "3.2.4", "wait-on": "3.2.0", "webdriver-manager": "12.1.0", - "zone.js": "0.8.27" + "zone.js": "0.8.29" } }