Skip to content

Commit

Permalink
ref/ Upgrade to Angular 10.3 & Electron 9.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Maxime GRIS committed Jul 13, 2020
1 parent 2d33b15 commit 84f0519
Show file tree
Hide file tree
Showing 8 changed files with 83 additions and 66 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@

# Introduction

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

Currently runs with:

- Angular v10.0.2
- Electron v9.0.5
- Angular v10.0.3
- Electron v9.1.0
- Electron Builder v22.7.0

With this sample, you can :
Expand Down
2 changes: 1 addition & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
"schematics": {
"@schematics/angular:component": {
"prefix": "app",
"styleext": "scss"
"style": "scss"
},
"@schematics/angular:directive": {
"prefix": "app"
Expand Down
2 changes: 1 addition & 1 deletion e2e/tsconfig.e2e.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../tsconfig.json",
"extends": "../tsconfig.base.json",
"compilerOptions": {
"outDir": "../out-tsc/e2e",
"module": "commonjs",
Expand Down
58 changes: 29 additions & 29 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "angular-electron",
"version": "7.2.1",
"description": "Angular 9 with Electron (Typescript + SASS + Hot Reload)",
"version": "8.0.0",
"description": "Angular 10 with Electron (Typescript + SASS + Hot Reload)",
"homepage": "https://github.com/maximegris/angular-electron",
"author": {
"name": "Maxime GRIS",
"email": "maxime.gris@gmail.com"
},
"keywords": [
"angular",
"angular 9",
"angular 10",
"electron",
"typescript",
"eslint",
Expand Down Expand Up @@ -38,54 +38,54 @@
"lint": "ng lint"
},
"devDependencies": {
"@angular-builders/custom-webpack": "9.1.0",
"@angular-devkit/build-angular": "0.901.9",
"@angular-builders/custom-webpack": "9.2.0",
"@angular-devkit/build-angular": "0.1000.2",
"@angular-eslint/builder": "0.0.1-alpha.32",
"@angular-eslint/eslint-plugin": "0.0.1-alpha.32",
"@angular-eslint/eslint-plugin-template": "0.0.1-alpha.32",
"@angular-eslint/template-parser": "0.0.1-alpha.32",
"@angular/cli": "9.1.9",
"@angular/common": "9.1.11",
"@angular/compiler": "9.1.11",
"@angular/compiler-cli": "9.1.11",
"@angular/core": "9.1.11",
"@angular/forms": "9.1.11",
"@angular/language-service": "9.1.11",
"@angular/platform-browser": "9.1.11",
"@angular/platform-browser-dynamic": "9.1.11",
"@angular/router": "9.1.11",
"@ngx-translate/core": "12.1.2",
"@ngx-translate/http-loader": "5.0.0",
"@types/jasmine": "3.5.10",
"@angular/cli": "10.0.2",
"@angular/common": "10.0.3",
"@angular/compiler": "10.0.3",
"@angular/compiler-cli": "10.0.3",
"@angular/core": "10.0.3",
"@angular/forms": "10.0.3",
"@angular/language-service": "10.0.3",
"@angular/platform-browser": "10.0.3",
"@angular/platform-browser-dynamic": "10.0.3",
"@angular/router": "10.0.3",
"@ngx-translate/core": "13.0.0",
"@ngx-translate/http-loader": "6.0.0",
"@types/jasmine": "3.5.11",
"@types/jasminewd2": "2.0.8",
"@types/mocha": "7.0.2",
"@types/node": "12.11.1",
"@typescript-eslint/eslint-plugin": "3.3.0",
"@typescript-eslint/eslint-plugin-tslint": "3.3.0",
"@typescript-eslint/parser": "3.3.0",
"@types/node": "12.12.6",
"@typescript-eslint/eslint-plugin": "3.6.0",
"@typescript-eslint/eslint-plugin-tslint": "3.6.0",
"@typescript-eslint/parser": "3.6.0",
"chai": "4.2.0",
"conventional-changelog-cli": "2.0.34",
"core-js": "3.6.5",
"cross-env": "7.0.2",
"electron": "9.0.4",
"electron": "9.1.0",
"electron-builder": "22.7.0",
"electron-reload": "1.5.0",
"eslint": "7.3.0",
"eslint-plugin-import": "2.21.2",
"eslint": "7.4.0",
"eslint-plugin-import": "2.22.0",
"jasmine-core": "3.5.0",
"jasmine-spec-reporter": "5.0.2",
"karma": "5.1.0",
"karma-coverage-istanbul-reporter": "3.0.3",
"karma-electron": "6.3.0",
"karma-jasmine": "3.3.1",
"karma-jasmine-html-reporter": "1.5.4",
"mocha": "8.0.1",
"mocha": "7.2.0",
"npm-run-all": "4.1.5",
"rxjs": "6.5.5",
"spectron": "11.0.0",
"rxjs": "6.6.0",
"spectron": "11.1.0",
"ts-node": "8.10.2",
"tslib": "2.0.0",
"typescript": "3.8.3",
"typescript": "3.9.6",
"wait-on": "5.0.1",
"webdriver-manager": "12.1.7",
"zone.js": "0.10.3"
Expand Down
2 changes: 1 addition & 1 deletion src/tsconfig.app.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../tsconfig.json",
"extends": "../tsconfig.base.json",
"compilerOptions": {
"outDir": "../out-tsc/app",
"module": "es2015",
Expand Down
2 changes: 1 addition & 1 deletion src/tsconfig.spec.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../tsconfig.json",
"extends": "../tsconfig.base.json",
"compilerOptions": {
"outDir": "../out-tsc/spec",
"module": "commonjs",
Expand Down
32 changes: 32 additions & 0 deletions tsconfig.base.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"compileOnSave": false,
"compilerOptions": {
"module": "es2020",
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"target": "es5",
"typeRoots": [
"node_modules/@types"
],
"lib": [
"es2017",
"es2016",
"es2015",
"dom"
]
},
"files": [
"src/main.ts",
"src/polyfills.ts"
],
"include": [
"src/**/*.d.ts"
],
"exclude": [
"node_modules"
]
}
45 changes: 15 additions & 30 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,32 +1,17 @@
/*
This is a "Solution Style" tsconfig.json file, and is used by editors and TypeScript’s language server to improve development experience.
It is not intended to be used to perform a compilation.
To learn more about this file see: https://angular.io/config/solution-tsconfig.
*/
{
"compileOnSave": false,
"compilerOptions": {
"module": "esnext",
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"target": "es5",
"typeRoots": [
"node_modules/@types"
],
"lib": [
"es2017",
"es2016",
"es2015",
"dom"
]
},
"files": [
"src/main.ts",
"src/polyfills.ts"
],
"include": [
"src/**/*.d.ts"
],
"exclude": [
"node_modules"
"files": [],
"references": [
{
"path": "./src/tsconfig.app.json"
},
{
"path": "./src/tsconfig.spec.json"
}
]
}
}

0 comments on commit 84f0519

Please sign in to comment.