Skip to content

Commit 84f0519

Browse files
author
Maxime GRIS
committed
ref/ Upgrade to Angular 10.3 & Electron 9.1
1 parent 2d33b15 commit 84f0519

8 files changed

+83
-66
lines changed

Diff for: ‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111

1212
# Introduction
1313

14-
Bootstrap and package your project with Angular 9 and Electron 8 (Typescript + SASS + Hot Reload) for creating Desktop applications.
14+
Bootstrap and package your project with Angular 10 and Electron 8 (Typescript + SASS + Hot Reload) for creating Desktop applications.
1515

1616
Currently runs with:
1717

18-
- Angular v10.0.2
19-
- Electron v9.0.5
18+
- Angular v10.0.3
19+
- Electron v9.1.0
2020
- Electron Builder v22.7.0
2121

2222
With this sample, you can :

Diff for: ‎angular.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162
"schematics": {
163163
"@schematics/angular:component": {
164164
"prefix": "app",
165-
"styleext": "scss"
165+
"style": "scss"
166166
},
167167
"@schematics/angular:directive": {
168168
"prefix": "app"

Diff for: ‎e2e/tsconfig.e2e.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../tsconfig.json",
2+
"extends": "../tsconfig.base.json",
33
"compilerOptions": {
44
"outDir": "../out-tsc/e2e",
55
"module": "commonjs",

Diff for: ‎package.json

+29-29
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"name": "angular-electron",
3-
"version": "7.2.1",
4-
"description": "Angular 9 with Electron (Typescript + SASS + Hot Reload)",
3+
"version": "8.0.0",
4+
"description": "Angular 10 with Electron (Typescript + SASS + Hot Reload)",
55
"homepage": "https://github.com/maximegris/angular-electron",
66
"author": {
77
"name": "Maxime GRIS",
88
"email": "[email protected]"
99
},
1010
"keywords": [
1111
"angular",
12-
"angular 9",
12+
"angular 10",
1313
"electron",
1414
"typescript",
1515
"eslint",
@@ -38,54 +38,54 @@
3838
"lint": "ng lint"
3939
},
4040
"devDependencies": {
41-
"@angular-builders/custom-webpack": "9.1.0",
42-
"@angular-devkit/build-angular": "0.901.9",
41+
"@angular-builders/custom-webpack": "9.2.0",
42+
"@angular-devkit/build-angular": "0.1000.2",
4343
"@angular-eslint/builder": "0.0.1-alpha.32",
4444
"@angular-eslint/eslint-plugin": "0.0.1-alpha.32",
4545
"@angular-eslint/eslint-plugin-template": "0.0.1-alpha.32",
4646
"@angular-eslint/template-parser": "0.0.1-alpha.32",
47-
"@angular/cli": "9.1.9",
48-
"@angular/common": "9.1.11",
49-
"@angular/compiler": "9.1.11",
50-
"@angular/compiler-cli": "9.1.11",
51-
"@angular/core": "9.1.11",
52-
"@angular/forms": "9.1.11",
53-
"@angular/language-service": "9.1.11",
54-
"@angular/platform-browser": "9.1.11",
55-
"@angular/platform-browser-dynamic": "9.1.11",
56-
"@angular/router": "9.1.11",
57-
"@ngx-translate/core": "12.1.2",
58-
"@ngx-translate/http-loader": "5.0.0",
59-
"@types/jasmine": "3.5.10",
47+
"@angular/cli": "10.0.2",
48+
"@angular/common": "10.0.3",
49+
"@angular/compiler": "10.0.3",
50+
"@angular/compiler-cli": "10.0.3",
51+
"@angular/core": "10.0.3",
52+
"@angular/forms": "10.0.3",
53+
"@angular/language-service": "10.0.3",
54+
"@angular/platform-browser": "10.0.3",
55+
"@angular/platform-browser-dynamic": "10.0.3",
56+
"@angular/router": "10.0.3",
57+
"@ngx-translate/core": "13.0.0",
58+
"@ngx-translate/http-loader": "6.0.0",
59+
"@types/jasmine": "3.5.11",
6060
"@types/jasminewd2": "2.0.8",
6161
"@types/mocha": "7.0.2",
62-
"@types/node": "12.11.1",
63-
"@typescript-eslint/eslint-plugin": "3.3.0",
64-
"@typescript-eslint/eslint-plugin-tslint": "3.3.0",
65-
"@typescript-eslint/parser": "3.3.0",
62+
"@types/node": "12.12.6",
63+
"@typescript-eslint/eslint-plugin": "3.6.0",
64+
"@typescript-eslint/eslint-plugin-tslint": "3.6.0",
65+
"@typescript-eslint/parser": "3.6.0",
6666
"chai": "4.2.0",
6767
"conventional-changelog-cli": "2.0.34",
6868
"core-js": "3.6.5",
6969
"cross-env": "7.0.2",
70-
"electron": "9.0.4",
70+
"electron": "9.1.0",
7171
"electron-builder": "22.7.0",
7272
"electron-reload": "1.5.0",
73-
"eslint": "7.3.0",
74-
"eslint-plugin-import": "2.21.2",
73+
"eslint": "7.4.0",
74+
"eslint-plugin-import": "2.22.0",
7575
"jasmine-core": "3.5.0",
7676
"jasmine-spec-reporter": "5.0.2",
7777
"karma": "5.1.0",
7878
"karma-coverage-istanbul-reporter": "3.0.3",
7979
"karma-electron": "6.3.0",
8080
"karma-jasmine": "3.3.1",
8181
"karma-jasmine-html-reporter": "1.5.4",
82-
"mocha": "8.0.1",
82+
"mocha": "7.2.0",
8383
"npm-run-all": "4.1.5",
84-
"rxjs": "6.5.5",
85-
"spectron": "11.0.0",
84+
"rxjs": "6.6.0",
85+
"spectron": "11.1.0",
8686
"ts-node": "8.10.2",
8787
"tslib": "2.0.0",
88-
"typescript": "3.8.3",
88+
"typescript": "3.9.6",
8989
"wait-on": "5.0.1",
9090
"webdriver-manager": "12.1.7",
9191
"zone.js": "0.10.3"

Diff for: ‎src/tsconfig.app.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../tsconfig.json",
2+
"extends": "../tsconfig.base.json",
33
"compilerOptions": {
44
"outDir": "../out-tsc/app",
55
"module": "es2015",

Diff for: ‎src/tsconfig.spec.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../tsconfig.json",
2+
"extends": "../tsconfig.base.json",
33
"compilerOptions": {
44
"outDir": "../out-tsc/spec",
55
"module": "commonjs",

Diff for: ‎tsconfig.base.json

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"compileOnSave": false,
3+
"compilerOptions": {
4+
"module": "es2020",
5+
"outDir": "./dist/out-tsc",
6+
"sourceMap": true,
7+
"declaration": false,
8+
"moduleResolution": "node",
9+
"emitDecoratorMetadata": true,
10+
"experimentalDecorators": true,
11+
"target": "es5",
12+
"typeRoots": [
13+
"node_modules/@types"
14+
],
15+
"lib": [
16+
"es2017",
17+
"es2016",
18+
"es2015",
19+
"dom"
20+
]
21+
},
22+
"files": [
23+
"src/main.ts",
24+
"src/polyfills.ts"
25+
],
26+
"include": [
27+
"src/**/*.d.ts"
28+
],
29+
"exclude": [
30+
"node_modules"
31+
]
32+
}

Diff for: ‎tsconfig.json

+15-30
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,17 @@
1+
/*
2+
This is a "Solution Style" tsconfig.json file, and is used by editors and TypeScript’s language server to improve development experience.
3+
It is not intended to be used to perform a compilation.
4+
5+
To learn more about this file see: https://angular.io/config/solution-tsconfig.
6+
*/
17
{
2-
"compileOnSave": false,
3-
"compilerOptions": {
4-
"module": "esnext",
5-
"outDir": "./dist/out-tsc",
6-
"sourceMap": true,
7-
"declaration": false,
8-
"moduleResolution": "node",
9-
"emitDecoratorMetadata": true,
10-
"experimentalDecorators": true,
11-
"target": "es5",
12-
"typeRoots": [
13-
"node_modules/@types"
14-
],
15-
"lib": [
16-
"es2017",
17-
"es2016",
18-
"es2015",
19-
"dom"
20-
]
21-
},
22-
"files": [
23-
"src/main.ts",
24-
"src/polyfills.ts"
25-
],
26-
"include": [
27-
"src/**/*.d.ts"
28-
],
29-
"exclude": [
30-
"node_modules"
8+
"files": [],
9+
"references": [
10+
{
11+
"path": "./src/tsconfig.app.json"
12+
},
13+
{
14+
"path": "./src/tsconfig.spec.json"
15+
}
3116
]
32-
}
17+
}

0 commit comments

Comments
 (0)