david.tahir/AngularTicTacToe
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into spectron

Browse Source
This commit is contained in:
Maxime GRIS
2019-03-02 20:32:10 +01:00
committed by GitHub
parent 258198393d 915b263e76
commit 87d0483cab
3 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -90,7 +90,7 @@ Note that you can't use Electron or NodeJS native libraries in this case. Please
- Angular 7 & Electron 3 : (master) - Angular 7 & Electron 3 : (master)
[build-badge]: https://travis-ci.org/maximegris/angular-electron.svg?branch=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-badge]: https://dependencyci.com/github/maximegris/angular-electron/badge
[dependencyci]: https://dependencyci.com/github/maximegris/angular-electron [dependencyci]: https://dependencyci.com/github/maximegris/angular-electron
[license-badge]: https://img.shields.io/badge/license-Apache2-blue.svg?style=flat [license-badge]: https://img.shields.io/badge/license-Apache2-blue.svg?style=flat

5
main.ts
View File

@@ -16,7 +16,10 @@ function createWindow() {
x: 0, x: 0,
y: 0, y: 0,
width: size.width, width: size.width,
height: size.height height: size.height,
webPreferences: {
nodeIntegration: true,
},
}); });
if (serve) { if (serve) {

32
package.json
View File

@@ -39,17 +39,17 @@
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "0.12.1", "@angular-devkit/build-angular": "0.12.1",
"@angular/cli": "7.2.1", "@angular/cli": "7.3.3",
"@angular/common": "7.2.0", "@angular/common": "7.2.7",
"@angular/compiler": "7.2.0", "@angular/compiler": "7.2.7",
"@angular/compiler-cli": "7.2.0", "@angular/compiler-cli": "7.2.7",
"@angular/core": "7.2.0", "@angular/core": "7.2.7",
"@angular/forms": "7.2.0", "@angular/forms": "7.2.7",
"@angular/http": "7.2.0", "@angular/http": "7.2.7",
"@angular/language-service": "7.2.0", "@angular/language-service": "7.2.7",
"@angular/platform-browser": "7.2.0", "@angular/platform-browser": "7.2.7",
"@angular/platform-browser-dynamic": "7.2.0", "@angular/platform-browser-dynamic": "7.2.7",
"@angular/router": "7.2.0", "@angular/router": "7.2.7",
"@ngx-translate/core": "11.0.1", "@ngx-translate/core": "11.0.1",
"@ngx-translate/http-loader": "4.0.0", "@ngx-translate/http-loader": "4.0.0",
"@types/jasmine": "2.8.7", "@types/jasmine": "2.8.7",
@@ -69,15 +69,15 @@
"karma-coverage-istanbul-reporter": "2.0.4", "karma-coverage-istanbul-reporter": "2.0.4",
"karma-jasmine": "2.0.1", "karma-jasmine": "2.0.1",
"karma-jasmine-html-reporter": "1.4.0", "karma-jasmine-html-reporter": "1.4.0",
"mocha": "^6.0.2", "mocha": "6.0.2",
"npm-run-all": "4.1.5", "npm-run-all": "4.1.5",
"rxjs": "6.3.3", "spectron": "5.0.0",
"spectron": "^5.0.0", "rxjs": "6.4.0",
"ts-node": "7.0.1", "ts-node": "7.0.1",
"tslint": "5.11.0", "tslint": "5.11.0",
"typescript": "3.2.2", "typescript": "3.2.4",
"wait-on": "3.2.0", "wait-on": "3.2.0",
"webdriver-manager": "12.1.0", "webdriver-manager": "12.1.0",
"zone.js": "0.8.27" "zone.js": "0.8.29"
} }
} }