Skip to content

Commit 21f7401

Browse files
author
Maxime GRIS
committed
misc/ upgrade Electron (9.0.4) / Angular (9.1.11)
1 parent a8628fc commit 21f7401

File tree

2 files changed

+31
-33
lines changed

2 files changed

+31
-33
lines changed

Diff for: README.md

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

1616
Currently runs with:
1717

18-
- Angular v9.1.4
19-
- Electron v8.2.5
20-
- Electron Builder v22.6.0
18+
- Angular v9.1.11
19+
- Electron v9.0.4
20+
- Electron Builder v22.7.0
2121

2222
With this sample, you can :
2323

@@ -71,9 +71,7 @@ You can disable "Developer Tools" by commenting `win.webContents.openDevTools();
7171
|`npm run build`| Build the app. Your built files are in the /dist folder. |
7272
|`npm run build:prod`| Build the app with Angular aot. Your built files are in the /dist folder. |
7373
|`npm run electron:local`| Builds your application and start electron
74-
|`npm run electron:linux`| Builds your application and creates an app consumable on linux system |
75-
|`npm run electron:windows`| On a Windows OS, builds your application and creates an app consumable in windows 32/64 bit systems |
76-
|`npm run electron:mac`| On a MAC OS, builds your application and generates a `.app` file of your application that can be run on Mac |
74+
|`npm run electron:build`| Builds your application and creates an app consumable based on your operating system |
7775

7876
**Your application is optimised. Only /dist folder and node dependencies are included in the executable.**
7977

@@ -93,7 +91,7 @@ Maybe you want to execute the application in the browser with hot reload ? Just
9391
- Angular 6 & Electron 3 : Branch [angular6](https://github.com/maximegris/angular-electron/tree/angular6)
9492
- Angular 7 & Electron 3 : Branch [angular7](https://github.com/maximegris/angular-electron/tree/angular7)
9593
- Angular 8 & Electron 7 : Branch [angular8](https://github.com/maximegris/angular-electron/tree/angular8)
96-
- Angular 9 & Electron 8 : (master)
94+
- Angular 9 & Electron 9 : (master)
9795

9896
[build-badge]: https://travis-ci.org/maximegris/angular-electron.svg?branch=master&style=style=flat-square
9997
[build]: https://travis-ci.org/maximegris/angular-electron

Diff for: package.json

+26-26
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
"ng:serve": "ng serve",
2929
"ng:serve:web": "ng serve -c web -o",
3030
"electron:serve-tsc": "tsc -p tsconfig-serve.json",
31-
"electron:serve": "wait-on http-get://localhost:4200/ && npm run electron:serve-tsc && electron . --serve",
32-
"electron:local": "npm run build:prod && electron .",
31+
"electron:serve": "wait-on tcp:4200 && npm run electron:serve-tsc && npx electron . --serve",
32+
"electron:local": "npm run build:prod && npx electron .",
3333
"electron:build": "npm run build:prod && electron-builder build",
3434
"test": "ng test --watch=false",
3535
"test:watch": "ng test",
@@ -39,20 +39,20 @@
3939
},
4040
"devDependencies": {
4141
"@angular-builders/custom-webpack": "9.1.0",
42-
"@angular-devkit/build-angular": "0.901.4",
42+
"@angular-devkit/build-angular": "0.901.9",
4343
"@angular-eslint/builder": "0.0.1-alpha.18",
44-
"@angular/cli": "9.1.4",
45-
"@angular/common": "9.1.4",
46-
"@angular/compiler": "9.1.4",
47-
"@angular/compiler-cli": "9.1.4",
48-
"@angular/core": "9.1.4",
49-
"@angular/forms": "9.1.4",
50-
"@angular/language-service": "9.1.4",
51-
"@angular/platform-browser": "9.1.4",
52-
"@angular/platform-browser-dynamic": "9.1.4",
53-
"@angular/router": "9.1.4",
44+
"@angular/cli": "9.1.9",
45+
"@angular/common": "9.1.11",
46+
"@angular/compiler": "9.1.11",
47+
"@angular/compiler-cli": "9.1.11",
48+
"@angular/core": "9.1.11",
49+
"@angular/forms": "9.1.11",
50+
"@angular/language-service": "9.1.11",
51+
"@angular/platform-browser": "9.1.11",
52+
"@angular/platform-browser-dynamic": "9.1.11",
53+
"@angular/router": "9.1.11",
5454
"@ngx-translate/core": "12.1.2",
55-
"@ngx-translate/http-loader": "4.0.0",
55+
"@ngx-translate/http-loader": "5.0.0",
5656
"@types/jasmine": "3.5.10",
5757
"@types/jasminewd2": "2.0.8",
5858
"@types/mocha": "7.0.2",
@@ -61,30 +61,30 @@
6161
"@typescript-eslint/parser": "2.27.0",
6262
"chai": "4.2.0",
6363
"codelyzer": "5.2.2",
64-
"conventional-changelog-cli": "2.0.32",
64+
"conventional-changelog-cli": "2.0.34",
6565
"core-js": "3.6.5",
6666
"cross-env": "7.0.2",
6767
"devtron": "1.4.0",
68-
"electron": "8.2.5",
69-
"electron-builder": "22.6.0",
68+
"electron": "9.0.4",
69+
"electron-builder": "22.7.0",
7070
"electron-reload": "1.5.0",
7171
"eslint": "6.8.0",
7272
"eslint-plugin-import": "2.20.2",
7373
"jasmine-core": "3.5.0",
7474
"jasmine-spec-reporter": "5.0.2",
75-
"karma": "5.0.4",
76-
"karma-coverage-istanbul-reporter": "3.0.0",
75+
"karma": "5.1.0",
76+
"karma-coverage-istanbul-reporter": "3.0.3",
7777
"karma-electron": "6.3.0",
78-
"karma-jasmine": "3.1.1",
79-
"karma-jasmine-html-reporter": "1.5.3",
80-
"mocha": "7.1.2",
78+
"karma-jasmine": "3.3.1",
79+
"karma-jasmine-html-reporter": "1.5.4",
80+
"mocha": "8.0.1",
8181
"npm-run-all": "4.1.5",
8282
"rxjs": "6.5.5",
83-
"spectron": "10.0.1",
84-
"ts-node": "8.9.1",
85-
"tslib": "1.11.1",
83+
"spectron": "11.0.0",
84+
"ts-node": "8.10.2",
85+
"tslib": "2.0.0",
8686
"typescript": "3.8.3",
87-
"wait-on": "4.0.2",
87+
"wait-on": "5.0.1",
8888
"webdriver-manager": "12.1.7",
8989
"zone.js": "0.10.3"
9090
},

0 commit comments

Comments
 (0)