Skip to content

Commit 87d0483

Browse files
authored
Merge branch 'master' into spectron
2 parents 2581983 + 915b263 commit 87d0483

File tree

3 files changed

+21
-18
lines changed

3 files changed

+21
-18
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ Note that you can't use Electron or NodeJS native libraries in this case. Please
9090
- Angular 7 & Electron 3 : (master)
9191

9292
[build-badge]: https://travis-ci.org/maximegris/angular-electron.svg?branch=master
93-
[build]: https://travis-ci.org/maximegris/angular-electron.svg?branch=master
93+
[build]: https://travis-ci.org/maximegris/angular-electron
9494
[dependencyci-badge]: https://dependencyci.com/github/maximegris/angular-electron/badge
9595
[dependencyci]: https://dependencyci.com/github/maximegris/angular-electron
9696
[license-badge]: https://img.shields.io/badge/license-Apache2-blue.svg?style=flat

main.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ function createWindow() {
1616
x: 0,
1717
y: 0,
1818
width: size.width,
19-
height: size.height
19+
height: size.height,
20+
webPreferences: {
21+
nodeIntegration: true,
22+
},
2023
});
2124

2225
if (serve) {

package.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,17 @@
3939
},
4040
"devDependencies": {
4141
"@angular-devkit/build-angular": "0.12.1",
42-
"@angular/cli": "7.2.1",
43-
"@angular/common": "7.2.0",
44-
"@angular/compiler": "7.2.0",
45-
"@angular/compiler-cli": "7.2.0",
46-
"@angular/core": "7.2.0",
47-
"@angular/forms": "7.2.0",
48-
"@angular/http": "7.2.0",
49-
"@angular/language-service": "7.2.0",
50-
"@angular/platform-browser": "7.2.0",
51-
"@angular/platform-browser-dynamic": "7.2.0",
52-
"@angular/router": "7.2.0",
42+
"@angular/cli": "7.3.3",
43+
"@angular/common": "7.2.7",
44+
"@angular/compiler": "7.2.7",
45+
"@angular/compiler-cli": "7.2.7",
46+
"@angular/core": "7.2.7",
47+
"@angular/forms": "7.2.7",
48+
"@angular/http": "7.2.7",
49+
"@angular/language-service": "7.2.7",
50+
"@angular/platform-browser": "7.2.7",
51+
"@angular/platform-browser-dynamic": "7.2.7",
52+
"@angular/router": "7.2.7",
5353
"@ngx-translate/core": "11.0.1",
5454
"@ngx-translate/http-loader": "4.0.0",
5555
"@types/jasmine": "2.8.7",
@@ -69,15 +69,15 @@
6969
"karma-coverage-istanbul-reporter": "2.0.4",
7070
"karma-jasmine": "2.0.1",
7171
"karma-jasmine-html-reporter": "1.4.0",
72-
"mocha": "^6.0.2",
72+
"mocha": "6.0.2",
7373
"npm-run-all": "4.1.5",
74-
"rxjs": "6.3.3",
75-
"spectron": "^5.0.0",
74+
"spectron": "5.0.0",
75+
"rxjs": "6.4.0",
7676
"ts-node": "7.0.1",
7777
"tslint": "5.11.0",
78-
"typescript": "3.2.2",
78+
"typescript": "3.2.4",
7979
"wait-on": "3.2.0",
8080
"webdriver-manager": "12.1.0",
81-
"zone.js": "0.8.27"
81+
"zone.js": "0.8.29"
8282
}
8383
}

0 commit comments

Comments
 (0)