Merge branch 'maximegris:main' into master

Author: heliomarpm

.eslintrc.json

@@ -20,11 +20,18 @@
         "createDefaultProgram": true
       },
       "extends": [
-        "plugin:@angular-eslint/ng-cli-compat",
-        "plugin:@angular-eslint/ng-cli-compat--formatting-add-on",
+        "plugin:@angular-eslint/recommended",
+        "eslint:recommended",
+        "plugin:@typescript-eslint/recommended",
+        "plugin:@typescript-eslint/recommended-requiring-type-checking",
         "plugin:@angular-eslint/template/process-inline-templates"
       ],
       "rules": {
+        "@typescript-eslint/no-empty-function": 0,
+        "@typescript-eslint/no-explicit-any": 0,
+        "@typescript-eslint/no-unsafe-assignment": 0,
+        "@typescript-eslint/no-unsafe-call": 0,
+        "@typescript-eslint/no-unsafe-member-access": 0,
         "prefer-arrow/prefer-arrow-functions": 0,
         "@angular-eslint/directive-selector":  0,
         "@angular-eslint/component-selector": [
@@ -34,7 +41,8 @@
             "prefix": "app",
             "style": "kebab-case"
           }
-        ]
+        ],
+        "jsdoc/newline-after-description": 0
       }
     },
     {
@@ -48,4 +56,4 @@
       }
     }
   ]
-}
+}

.github/workflows/macos.yml

@@ -15,14 +15,14 @@ on:
   workflow_dispatch:
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
-permissions:
-  contents: read
-
+permissions:
+  contents: read
+
 jobs:
   build:
     strategy:
       matrix:
-        node-version: [16]
+        node-version: [18.16]
 
     # The type of runner that the job will run on
     runs-on: macos-latest

.github/workflows/ubuntu.yml

@@ -19,7 +19,7 @@ jobs:
   build:
     strategy:
       matrix:
-        node-version: [16]
+        node-version: [18.16]
 
     # The type of runner that the job will run on
     runs-on: ubuntu-18.04

.github/workflows/windows.yml

@@ -15,14 +15,14 @@ on:
   workflow_dispatch:
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
-permissions:
-  contents: read
-
+permissions:
+  contents: read
+
 jobs:
   build:
     strategy:
       matrix:
-        node-version: [16]
+        node-version: [18.16]
 
     # The type of runner that the job will run on
     runs-on: windows-latest

.node-version

@@ -1 +1 @@
-16
+18

CHANGELOG.md

@@ -1,5 +1,30 @@
+## 13.0.0 (2023-06-30)
+
+* fix/ Use globalThis property, a standard way of accessing the global this on browser & Node ([45bdbfa](https://github.com/maximegris/angular-electron/commit/45bdbfa))
+* misc/ disable 'jsdoc/newline-after-description' rule ([9b22567](https://github.com/maximegris/angular-electron/commit/9b22567))
+* misc/ Enable Typescript strict mode ([f60add8](https://github.com/maximegris/angular-electron/commit/f60add8))
+* misc/ Update angular material HOW TO guide ([18c5431](https://github.com/maximegris/angular-electron/commit/18c5431))
+* misc/ Upgrade electron-builder dependency ([04a3b14](https://github.com/maximegris/angular-electron/commit/04a3b14))
+* misc/ Upgrade to Angular 15.2.9 & Electron 24 ([7c78613](https://github.com/maximegris/angular-electron/commit/7c78613))
+* misc/ Upgrade to Angular 16.1.3 & Electron 2 ([5f8e817](https://github.com/maximegris/angular-electron/commit/5f8e817))
+
+
+
+## 12.0.0 (2023-02-17)
+
+* [Bumped Version] 12.0.0 ([f78a81f](https://github.com/maximegris/angular-electron/commit/f78a81f))
+* misc/ Upgrade to Electron 22 ([8cb0acd](https://github.com/maximegris/angular-electron/commit/8cb0acd))
+* package json description updated ([8726c0a](https://github.com/maximegris/angular-electron/commit/8726c0a))
+* fix(test): remove require.context (not needed) ([680d18d](https://github.com/maximegris/angular-electron/commit/680d18d))
+* refactor: use latest eslint ([41abef1](https://github.com/maximegris/angular-electron/commit/41abef1))
+* refactor: use latest eslint & change docs ([9f8add6](https://github.com/maximegris/angular-electron/commit/9f8add6))
+* feat: use latest angular / angular-builder / angular-eslint ([fd9f876](https://github.com/maximegris/angular-electron/commit/fd9f876))
+
+
+
 ## 11.2.0 (2022-10-16)
 
+* [Bumped Version] 11.2.0 ([0fd7a31](https://github.com/maximegris/angular-electron/commit/0fd7a31))
 * misc/ Upgrade to Electron 21 ([ed23e89](https://github.com/maximegris/angular-electron/commit/ed23e89))
 
 

HOW_TO.md

@@ -14,6 +14,11 @@ ng add ngx-bootstrap
 
 ### How to install Angular Material
 
+Replace temporarily custom builders by default ones in `angular.json`
+
+@angular-builders/custom-webpack:browser => @angular-devkit/build-angular:browser \
+@angular-builders/custom-webpack:dev-server => @angular-devkit/build-angular:dev-server
+
 Add Angular Material using `ng add` command:
 
 ``` bash
@@ -24,16 +29,11 @@ You will get the following questions:
 ``` bash
 ? Choose a prebuilt theme name, or "custom" for a custom theme: *Choose any theme you like here*
 ? Set up global Angular Material typography styles? *Yes* 
-? Set up browser animations for Angular Material? *Yes*
+? Set up browser animations for Angular Material? *Do not include / error if you choose Include*
 ```
-Angular Material will start installing, but you will get the following error after installation:
+Angular Material Library is now installed in your project.
 
-``` bash
-Your project is not using the default builders for "build". The Angular Material schematics cannot add a theme to the workspace configuration if the builder has been changed.
-```
-*No need to Panic!* Just add your desired theme in style.scss:
+Put back custom builders in `angular.json`
 
-``` bash
-@import '@angular/material/prebuilt-themes/indigo-pink.css'
-```
-Angular Material Library is now installed in your project.
+@angular-devkit/build-angular:browser => @angular-builders/custom-webpack:browser \
+@angular-devkit/build-angular:dev-server => @angular-builders/custom-webpack:dev-server

README.md

@@ -14,12 +14,12 @@
 
 # Introduction
 
-Bootstrap and package your project with Angular 14 and Electron 21 (Typescript + SASS + Hot Reload) for creating Desktop applications.
+Bootstrap and package your project with Angular 16 and Electron 25 (Typescript + SASS + Hot Reload) for creating Desktop applications.
 
 Currently runs with:
 
-- Angular v14.2.6
-- Electron v21.1.1
+- Angular v16.1.3
+- Electron v25.2.0
 
 With this sample, you can:
 
@@ -29,7 +29,7 @@ With this sample, you can:
 
 /!\ Hot reload only pertains to the renderer process. The main electron process is not able to be hot reloaded, only restarted.
 
-/!\ Angular CLI & Electron Builder needs Node 14 or later to work correctly.
+/!\ Angular CLI & Electron Builder needs Node 18.10 or later to work correctly.
 
 ## Getting Started
 
@@ -140,6 +140,10 @@ Finally from VsCode press **Ctrl+Shift+D** and select **Application Debug** and
 
 Please note that Hot reload is only available in Renderer process.
 
+## Want to use Angular Material ? Ngx-Bootstrap ?
+
+Please refer to [HOW_TO file](./HOW_TO.md)
+
 ## Branch & Packages version
 
 - Angular 4 & Electron 1 : Branch [angular4](https://github.com/maximegris/angular-electron/tree/angular4)
@@ -152,8 +156,10 @@ Please note that Hot reload is only available in Renderer process.
 - Angular 11 & Electron 12 : Branch [angular11](https://github.com/maximegris/angular-electron/tree/angular11)
 - Angular 12 & Electron 16 : Branch [angular12](https://github.com/maximegris/angular-electron/tree/angular12)
 - Angular 13 & Electron 18 : Branch [angular13](https://github.com/maximegris/angular-electron/tree/angular13)
-- Angular 14 & Electron 21 : (main)
-
+- Angular 14 & Electron 21 : Branch [angular14](https://github.com/maximegris/angular-electron/tree/angular14)
+- Angular 15 & Electron 24 : Branch [angular15](https://github.com/maximegris/angular-electron/tree/angular15)
+- Angular 16 & Electron 25 : (main)
+- 
 [maintained-badge]: https://img.shields.io/badge/maintained-yes-brightgreen
 [license-badge]: https://img.shields.io/badge/license-MIT-blue.svg
 [license]: https://github.com/maximegris/angular-electron/blob/main/LICENSE.md