Skip to content

Commit 915b263

Browse files
authored
Merge pull request #313 from tla-dev/master
update versions and prepare for electron 5
2 parents 811476c + 07a5786 commit 915b263

File tree

2 files changed

+18
-15
lines changed

2 files changed

+18
-15
lines changed

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: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,17 @@
4040
"dependencies": {},
4141
"devDependencies": {
4242
"@angular-devkit/build-angular": "0.12.1",
43-
"@angular/cli": "7.2.1",
44-
"@angular/common": "7.2.0",
45-
"@angular/compiler": "7.2.0",
46-
"@angular/compiler-cli": "7.2.0",
47-
"@angular/core": "7.2.0",
48-
"@angular/forms": "7.2.0",
49-
"@angular/http": "7.2.0",
50-
"@angular/language-service": "7.2.0",
51-
"@angular/platform-browser": "7.2.0",
52-
"@angular/platform-browser-dynamic": "7.2.0",
53-
"@angular/router": "7.2.0",
43+
"@angular/cli": "7.3.3",
44+
"@angular/common": "7.2.7",
45+
"@angular/compiler": "7.2.7",
46+
"@angular/compiler-cli": "7.2.7",
47+
"@angular/core": "7.2.7",
48+
"@angular/forms": "7.2.7",
49+
"@angular/http": "7.2.7",
50+
"@angular/language-service": "7.2.7",
51+
"@angular/platform-browser": "7.2.7",
52+
"@angular/platform-browser-dynamic": "7.2.7",
53+
"@angular/router": "7.2.7",
5454
"@ngx-translate/core": "11.0.1",
5555
"@ngx-translate/http-loader": "4.0.0",
5656
"@types/jasmine": "2.8.7",
@@ -71,12 +71,12 @@
7171
"karma-jasmine-html-reporter": "1.4.0",
7272
"npm-run-all": "4.1.5",
7373
"protractor": "5.4.1",
74-
"rxjs": "6.3.3",
74+
"rxjs": "6.4.0",
7575
"ts-node": "7.0.1",
7676
"tslint": "5.11.0",
77-
"typescript": "3.2.2",
77+
"typescript": "3.2.4",
7878
"wait-on": "3.2.0",
7979
"webdriver-manager": "12.1.0",
80-
"zone.js": "0.8.27"
80+
"zone.js": "0.8.29"
8181
}
8282
}

0 commit comments

Comments
 (0)