misc/ Upgrade to Angular 16.1.3 & Electron 2

maximegris · Jun 30, 2023 · 5f8e817 · 5f8e817
1 parent 9b22567
commit 5f8e817
Show file tree

Hide file tree

Showing 15 changed files with 5,441 additions and 3,750 deletions.
diff --git a/.eslintrc.json b/.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": [

diff --git a/README.md b/README.md
@@ -14,12 +14,12 @@
 
 # Introduction
 
-Bootstrap and package your project with Angular 15 and Electron 24 (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 v15.2.9
-- Electron v24.3.0
+- 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
 
@@ -157,8 +157,9 @@ Please refer to [HOW_TO file](./HOW_TO.md)
 - 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 : Branch [angular14](https://github.com/maximegris/angular-electron/tree/angular14)
-- Angular 15 & Electron 24 : (main)
-
+- 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

diff --git a/angular.json b/angular.json
@@ -1,7 +1,9 @@
 {
   "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
   "cli": {
-    "defaultCollection": "@angular-eslint/schematics"
+    "schematicCollections": [
+      "@angular-eslint/schematics"
+    ]
   },
   "version": 1,
   "newProjectRoot": "projects",
@@ -183,7 +185,6 @@
       }
     }
   },
-  "defaultProject": "angular-electron",
   "schematics": {
     "@angular-eslint/schematics:application": {
       "setParserOptionsProject": true

diff --git a/app/main.ts b/app/main.ts
@@ -2,7 +2,7 @@ import {app, BrowserWindow, screen} from 'electron';
 import * as path from 'path';
 import * as fs from 'fs';
 
-let win: BrowserWindow = null;
+let win: BrowserWindow | null = null;
 const args = process.argv.slice(1),
   serve = args.some(val => val === '--serve');
 
@@ -19,7 +19,7 @@ function createWindow(): BrowserWindow {
     webPreferences: {
       nodeIntegration: true,
       allowRunningInsecureContent: (serve),
-      contextIsolation: false,  // false if you want to run e2e test with Spectron
+      contextIsolation: false,
     },
   });
 

diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/package.json b/app/package.json
@@ -5,7 +5,7 @@
     "name": "Maxime GRIS",
     "email": "[email protected]"
   },
-  "version": "12.0.1",
+  "version": "13.0.0",
   "main": "main.js",
   "private": true,
   "dependencies": {

diff --git a/e2e/main.spec.ts b/e2e/main.spec.ts
@@ -1,8 +1,8 @@
 import { BrowserContext, ElectronApplication, Page, _electron as electron } from 'playwright';
 import { test, expect } from '@playwright/test';
-const PATH = require('path');
+import * as PATH from 'path';
 
-test.describe('Check Home Page', async () => {
+test.describe('Check Home Page', () => {
   let app: ElectronApplication;
   let firstWindow: Page;
   let context: BrowserContext;
@@ -48,7 +48,7 @@ test.describe('Check Home Page', async () => {
 
   test('Check title', async () => {
     const elem = await firstWindow.$('app-home h1');
-    const text = await elem.innerText();
+    const text = elem ? await elem.innerText() : null;
     expect(text).toBe('App works !');
   });
 

diff --git a/e2e/playwright.config.ts b/e2e/playwright.config.ts
@@ -16,4 +16,5 @@ const config = {
   },
 };
 
+// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 module.exports = config;
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,4 +16,5 @@ const config = { @@
       },
     };
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
     module.exports = config;