Skip to content

Commit b71c514

Browse files
author
Maxime GRIS
committed
misc/ upgrade Electron 10
1 parent f41ce65 commit b71c514

File tree

4 files changed

+34
-34
lines changed

4 files changed

+34
-34
lines changed

Diff for: README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ Bootstrap and package your project with Angular 10 and Electron 9 (Typescript +
1515

1616
Currently runs with:
1717

18-
- Angular v10.0.9
19-
- Electron v9.2.0
18+
- Angular v10.0.14
19+
- Electron v10.1.0
2020
- Electron Builder v22.8.0
2121

2222
With this sample, you can :

Diff for: main.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ function createWindow(): BrowserWindow {
2020
webPreferences: {
2121
nodeIntegration: true,
2222
allowRunningInsecureContent: (serve) ? true : false,
23+
enableRemoteModule : false // true if you want to use remote module in renderer context (ie. Angular)
2324
},
2425
});
2526

@@ -52,9 +53,6 @@ function createWindow(): BrowserWindow {
5253
}
5354

5455
try {
55-
56-
app.allowRendererProcessReuse = true;
57-
5856
// This method will be called when Electron has finished
5957
// initialization and is ready to create browser windows.
6058
// Some APIs can only be used after this event occurs.

Diff for: package.json

+28-28
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-electron",
3-
"version": "8.0.3",
3+
"version": "8.0.4",
44
"description": "Angular 10 with Electron (Typescript + SASS + Hot Reload)",
55
"homepage": "https://github.com/maximegris/angular-electron",
66
"author": {
@@ -42,56 +42,56 @@
4242
},
4343
"devDependencies": {
4444
"@angular-builders/custom-webpack": "9.2.0",
45-
"@angular-devkit/build-angular": "0.1000.5",
46-
"@angular-eslint/builder": "0.0.1-alpha.32",
47-
"@angular-eslint/eslint-plugin": "0.0.1-alpha.32",
48-
"@angular-eslint/eslint-plugin-template": "0.0.1-alpha.32",
49-
"@angular-eslint/template-parser": "0.0.1-alpha.32",
50-
"@angular/cli": "10.0.5",
51-
"@angular/common": "10.0.9",
52-
"@angular/compiler": "10.0.9",
53-
"@angular/compiler-cli": "10.0.9",
54-
"@angular/core": "10.0.9",
55-
"@angular/forms": "10.0.9",
56-
"@angular/language-service": "10.0.9",
57-
"@angular/platform-browser": "10.0.9",
58-
"@angular/platform-browser-dynamic": "10.0.9",
59-
"@angular/router": "10.0.9",
45+
"@angular-devkit/build-angular": "0.1000.8",
46+
"@angular-eslint/builder": "0.2.0-beta.1",
47+
"@angular-eslint/eslint-plugin": "0.2.0-beta.1",
48+
"@angular-eslint/eslint-plugin-template": "0.2.0-beta.1",
49+
"@angular-eslint/template-parser": "0.2.0-beta.1",
50+
"@angular/cli": "10.0.8",
51+
"@angular/common": "10.0.14",
52+
"@angular/compiler": "10.0.14",
53+
"@angular/compiler-cli": "10.0.14",
54+
"@angular/core": "10.0.14",
55+
"@angular/forms": "10.0.14",
56+
"@angular/language-service": "10.0.14",
57+
"@angular/platform-browser": "10.0.14",
58+
"@angular/platform-browser-dynamic": "10.0.14",
59+
"@angular/router": "10.0.14",
6060
"@ngx-translate/core": "13.0.0",
6161
"@ngx-translate/http-loader": "6.0.0",
62-
"@types/jasmine": "3.5.12",
62+
"@types/jasmine": "3.5.14",
6363
"@types/jasminewd2": "2.0.8",
64-
"@types/mocha": "8.0.2",
64+
"@types/mocha": "8.0.3",
6565
"@types/node": "12.12.6",
66-
"@typescript-eslint/eslint-plugin": "3.9.0",
67-
"@typescript-eslint/eslint-plugin-tslint": "3.9.0",
68-
"@typescript-eslint/parser": "3.9.0",
66+
"@typescript-eslint/eslint-plugin": "3.10.1",
67+
"@typescript-eslint/eslint-plugin-tslint": "3.10.1",
68+
"@typescript-eslint/parser": "3.10.1",
6969
"chai": "4.2.0",
70-
"conventional-changelog-cli": "2.0.34",
70+
"conventional-changelog-cli": "2.1.0",
7171
"core-js": "3.6.5",
7272
"cross-env": "7.0.2",
73-
"electron": "9.2.0",
73+
"electron": "10.1.0",
7474
"electron-builder": "22.8.0",
7575
"electron-reload": "1.5.0",
76-
"eslint": "7.6.0",
76+
"eslint": "7.7.0",
7777
"eslint-plugin-import": "2.22.0",
7878
"jasmine-core": "3.6.0",
7979
"jasmine-spec-reporter": "5.0.2",
8080
"karma": "5.1.1",
8181
"karma-coverage-istanbul-reporter": "3.0.3",
8282
"karma-electron": "6.3.1",
83-
"karma-jasmine": "3.3.1",
83+
"karma-jasmine": "4.0.1",
8484
"karma-jasmine-html-reporter": "1.5.4",
85-
"mocha": "8.1.1",
85+
"mocha": "8.1.3",
8686
"npm-run-all": "4.1.5",
8787
"rxjs": "6.6.2",
8888
"spectron": "11.1.0",
89-
"ts-node": "8.10.2",
89+
"ts-node": "9.0.0",
9090
"tslib": "2.0.1",
9191
"typescript": "3.9.7",
9292
"wait-on": "5.0.1",
9393
"webdriver-manager": "12.1.7",
94-
"zone.js": "0.10.3"
94+
"zone.js": "0.11.1"
9595
},
9696
"engines": {
9797
"node": ">=10.13.0"

Diff for: src/app/core/services/electron/electron.service.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ export class ElectronService {
2525
if (this.isElectron) {
2626
this.ipcRenderer = window.require('electron').ipcRenderer;
2727
this.webFrame = window.require('electron').webFrame;
28-
this.remote = window.require('electron').remote;
28+
29+
// If you wan to use remote object, pleanse set enableRemoteModule to true in main.ts
30+
// this.remote = window.require('electron').remote;
2931

3032
this.childProcess = window.require('child_process');
3133
this.fs = window.require('fs');

0 commit comments

Comments
 (0)