Merge pull request #7 from olzzon/develop

fix: typesafety and fix of electron force update

Author: olzzon

package.json

@@ -45,9 +45,9 @@
         }
       ],
       "plugins": [
-        [
-          "@electron-forge/plugin-webpack",
-          {
+        {
+          "name": "@electron-forge/plugin-webpack",
+          "config": {
             "mainConfig": "./webpack.main.config.js",
             "renderer": {
               "config": "./webpack.renderer.config.js",
@@ -63,7 +63,7 @@
               ]
             }
           }
-        ]
+        }
       ]
     }
   },
@@ -80,6 +80,7 @@
     "@typescript-eslint/eslint-plugin": "^7.0.1",
     "@typescript-eslint/parser": "^7.0.1",
     "@vercel/webpack-asset-relocator-loader": "1.7.3",
+    "cross-env": "^7.0.3",
     "css-loader": "^6.10.0",
     "electron": "28.2.3",
     "eslint": "^8.56.0",
@@ -90,7 +91,8 @@
     "react-dom": "^18.2.0",
     "style-loader": "^3.3.4",
     "ts-loader": "^9.5.1",
-    "typescript": "~5.3.3"
+    "typescript": "~5.3.3",
+    "webpack-cli": "^5.1.4"
   },
   "dependencies": {
     "electron-squirrel-startup": "^1.0.0",

src/server/index.ts

@@ -22,15 +22,15 @@ export const restartApp = () => {
   console.log("Restarting Ninja-player");
   setTimeout(() => {
     app.relaunch();
-    mainWindow.destroy();
+    mainWindow?.destroy();
     app.exit(0);
   }, 1000);
 };
 
 export const quitApp = () => {
   console.log("Quiting Ninja-player");
   setTimeout(() => {
-    mainWindow.destroy();
+    mainWindow?.destroy();
     app.exit(0);
   }, 1000);
 };

src/server/preload.ts

@@ -1,7 +1,7 @@
 // See the Electron documentation for details on how to use preload scripts:
 // https://www.electronjs.org/docs/latest/tutorial/process-model#preload-scripts
 
-const { contextBridge, ipcRenderer } = require("electron");
+import { contextBridge, ipcRenderer } from "electron"
 
 // As an example, here we use the exposeInMainWorld API to expose the IPC renderer 
 // to the main window. They'll be accessible at "window.ipcRenderer".

src/server/utils/restApiPostToPortal.ts

@@ -4,14 +4,13 @@ import { post } from "request";
 
 export const restApiPostToPortal = (settings: ISettings) => {
   const options = {
-    url: settings.portalUrl,
     json: true,
     body: {
       id: settings.id,
       link: createAllURLs(settings),
     },
   };
-  post(options, (error, response) => {
+  post(settings.portalUrl || "", options, (error, response) => {
     if (error) {
       console.error(error);
       return;

tsconfig.json

@@ -1,6 +1,11 @@
 {
   "compilerOptions": {
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
     "allowJs": true,
+    "declaration": true,
+    "emitDeclarationOnly": true,
+    "allowImportingTsExtensions": true,
     "module": "commonjs",
     "skipLibCheck": true,
     "esModuleInterop": true,