Npm Electron and Angular upgrades (#197)

* Upgrade Electron * Angular v15 * Upgrade angular to v16 * Tweaks to get everything working post upgrades * Further fixes post upgrades
SMUnlimited · Dec 12, 2023 · 0e88d7e · 0e88d7e
1 parent b746f0e
commit 0e88d7e
Show file tree

Hide file tree

Showing 14 changed files with 17,285 additions and 15,719 deletions.
diff --git a/Electron/.eslintrc.json b/Electron/.eslintrc.json
@@ -1,7 +1,7 @@
 {
   "root": true,
   "ignorePatterns": [
-    "app/**/*", // ignore nodeJs files
+    "app/**/*",
     "dist/**/*",
     "release/**/*"
   ],
@@ -26,7 +26,7 @@
       ],
       "rules": {
         "prefer-arrow/prefer-arrow-functions": 0,
-        "@angular-eslint/directive-selector":  0,
+        "@angular-eslint/directive-selector": 0,
         "@angular-eslint/component-selector": [
           "error",
           {
@@ -44,8 +44,7 @@
       "extends": [
         "plugin:@angular-eslint/template/recommended"
       ],
-      "rules": {
-      }
+      "rules": {}
     }
   ]
-}
+}
diff --git a/Electron/.vscode/launch.json b/Electron/.vscode/launch.json
@@ -4,20 +4,20 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
-        {
-            "name": "Renderer",
-            "type": "chrome",
-            "request": "attach",
-            "port": 9876,
-            "url": "http://localhost:4200",
-            "sourceMaps": true,  
-            "timeout": 10000,
-            "trace": "verbose",
-            "sourceMapPathOverrides": {
-                "webpack:///./*": "${workspaceFolder}/*"
-            },
-            "preLaunchTask": "Build.Renderer"
-        },
+        // {
+        //     "name": "Renderer",
+        //     "type": "chrome",
+        //     "request": "attach",
+        //     "port": 9876,
+        //     "url": "http://localhost:4200",
+        //     "sourceMaps": true,  
+        //     "timeout": 10000,
+        //     "trace": "verbose",
+        //     "sourceMapPathOverrides": {
+        //         "webpack:///./*": "${workspaceFolder}/*"
+        //     },
+        //     "preLaunchTask": "Build.Renderer"
+        // },
         {
             "name": "Main",
             "type": "node",
@@ -40,7 +40,7 @@
     "compounds": [
         {
             "name": "Application Debug",
-            "configurations": [ "Renderer", "Main" ]
+            "configurations": [ "Main" ]
         }
     ]
 }
diff --git a/Electron/AMAI-release/install.js b/Electron/AMAI-release/install.js
@@ -34,7 +34,7 @@ const installOnDirectory = async () => {
   const response = args[0];
   const ver = args[2]
 
-  process.send(`#### Installing AMAI ${ver} ####`);
+  process.send(`#### Installing AMAI for ${ver} ####`);
 
   // TODO: change to receive array of maps
   if (fs.statSync(response).isDirectory()) {
@@ -44,13 +44,13 @@ const installOnDirectory = async () => {
     // on single map
     arrayOfFiles.push(response);
   }
-  
+
   if (!fs.existsSync(`Scripts\\${ver}\\common.ai`)) {
-    process.send(`ERROR: Cannot find resources\\AMAI\\Scripts\\${ver}\\common.ai`)
+    process.send(`ERROR: Cannot find ${process.cwd()}\\Scripts\\${ver}\\common.ai`)
     return
   }
   if (installCommander && !fs.existsSync(`Scripts\\Blizzard_${ver}.j`)) {
-    process.send(`ERROR: Cannot find resources\\AMAI\\Scripts\\blizzard_${ver}.j`)
+    process.send(`ERROR: Cannot find ${process.cwd()}\\Scripts\\blizzard_${ver}.j`)
     return
   }
 

diff --git a/Electron/CODE_OF_CONDUCT.md b/Electron/CODE_OF_CONDUCT.md
diff --git a/Electron/angular.json b/Electron/angular.json
@@ -184,5 +184,13 @@
       }
     }
   },
-  "defaultProject": "angular-electron"
+  "defaultProject": "angular-electron",
+  "schematics": {
+    "@angular-eslint/schematics:application": {
+      "setParserOptionsProject": true
+    },
+    "@angular-eslint/schematics:library": {
+      "setParserOptionsProject": true
+    }
+  }
 }
diff --git a/Electron/app/main.ts b/Electron/app/main.ts
@@ -31,7 +31,7 @@ const createWindow = (): BrowserWindow => {
     width: size.width,
     height: size.height,
     webPreferences: {
-      devTools: false,
+      devTools: true,
       nodeIntegration: true,
       allowRunningInsecureContent: (serve),
       contextIsolation: false,  // false if you want to run e2e test with Spectron

diff --git a/Electron/app/package-lock.json b/Electron/app/package-lock.json
diff --git a/Electron/app/package.json b/Electron/app/package.json
@@ -5,6 +5,6 @@
   "main": "main.js",
   "private": true,
   "dependencies": {
-    "@electron/remote": "2.0.8"
+    "@electron/remote": "^2.1.0"
   }
 }