Skip to content

Commit 07786a2

Browse files
author
Maxime GRIS
committed
misc/ upgrade to Electron 10 & Angular 10.1
1 parent 3309855 commit 07786a2

File tree

3 files changed

+30
-35
lines changed

3 files changed

+30
-35
lines changed

angular.json

-6
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,6 @@
130130
"lintFilePatterns": [
131131
"src/**.ts",
132132
"main.ts"
133-
],
134-
"exclude": [
135-
"**/node_modules/**"
136133
]
137134
}
138135
}
@@ -148,9 +145,6 @@
148145
"eslintConfig": ".eslintrc.json",
149146
"lintFilePatterns": [
150147
"e2e/**.ts"
151-
],
152-
"exclude": [
153-
"**/node_modules/**"
154148
]
155149
}
156150
}

main.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ function createWindow(): BrowserWindow {
2020
webPreferences: {
2121
nodeIntegration: true,
2222
allowRunningInsecureContent: (serve) ? true : false,
23-
enableRemoteModule : true // true if you want to run 2e2 test or use remote module in renderer context (ie. Angular)
23+
contextIsolation: false, // false if you want to run 2e2 test with Spectron
24+
enableRemoteModule : true // true if you want to run 2e2 test with Spectron or use remote module in renderer context (ie. Angular)
2425
},
2526
});
2627

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.4",
3+
"version": "8.0.5",
44
"description": "Angular 10 with Electron (Typescript + SASS + Hot Reload)",
55
"homepage": "https://github.com/maximegris/angular-electron",
66
"author": {
@@ -41,51 +41,51 @@
4141
"lint": "ng lint"
4242
},
4343
"devDependencies": {
44-
"@angular-builders/custom-webpack": "9.2.0",
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",
44+
"@angular-builders/custom-webpack": "10.0.1",
45+
"@angular-devkit/build-angular": "0.1001.3",
46+
"@angular-eslint/builder": "0.4.0-beta.2",
47+
"@angular-eslint/eslint-plugin": "0.4.0-beta.2",
48+
"@angular-eslint/eslint-plugin-template": "0.4.0-beta.2",
49+
"@angular-eslint/template-parser": "0.4.0-beta.2",
50+
"@angular/cli": "10.1.3",
51+
"@angular/common": "10.1.3",
52+
"@angular/compiler": "10.1.3",
53+
"@angular/compiler-cli": "10.1.3",
54+
"@angular/core": "10.1.3",
55+
"@angular/forms": "10.1.3",
56+
"@angular/language-service": "10.1.3",
57+
"@angular/platform-browser": "10.1.3",
58+
"@angular/platform-browser-dynamic": "10.1.3",
59+
"@angular/router": "10.1.3",
6060
"@ngx-translate/core": "13.0.0",
6161
"@ngx-translate/http-loader": "6.0.0",
6262
"@types/jasmine": "3.5.14",
6363
"@types/jasminewd2": "2.0.8",
6464
"@types/mocha": "8.0.3",
6565
"@types/node": "12.12.6",
66-
"@typescript-eslint/eslint-plugin": "3.10.1",
67-
"@typescript-eslint/eslint-plugin-tslint": "3.10.1",
68-
"@typescript-eslint/parser": "3.10.1",
66+
"@typescript-eslint/eslint-plugin": "4.2.0",
67+
"@typescript-eslint/eslint-plugin-tslint": "4.2.0",
68+
"@typescript-eslint/parser": "4.2.0",
6969
"chai": "4.2.0",
7070
"conventional-changelog-cli": "2.1.0",
7171
"core-js": "3.6.5",
7272
"cross-env": "7.0.2",
73-
"electron": "9.3.0",
74-
"electron-builder": "22.8.0",
73+
"electron": "10.1.2",
74+
"electron-builder": "22.8.1",
7575
"electron-reload": "1.5.0",
76-
"eslint": "7.7.0",
77-
"eslint-plugin-import": "2.22.0",
76+
"eslint": "7.10.0",
77+
"eslint-plugin-import": "2.22.1",
7878
"jasmine-core": "3.6.0",
79-
"jasmine-spec-reporter": "5.0.2",
80-
"karma": "5.1.1",
79+
"jasmine-spec-reporter": "6.0.0",
80+
"karma": "5.2.3",
8181
"karma-coverage-istanbul-reporter": "3.0.3",
8282
"karma-electron": "6.3.1",
8383
"karma-jasmine": "4.0.1",
8484
"karma-jasmine-html-reporter": "1.5.4",
8585
"mocha": "8.1.3",
8686
"npm-run-all": "4.1.5",
87-
"rxjs": "6.6.2",
88-
"spectron": "11.1.0",
87+
"rxjs": "6.6.3",
88+
"spectron": "12.0.0",
8989
"ts-node": "9.0.0",
9090
"tslib": "2.0.1",
9191
"typescript": "3.9.7",

0 commit comments

Comments
 (0)