Merge pull request #62 from oslabs-beta/dev

Dev

Author: esclarsky

main.js

@@ -206,6 +206,8 @@ function createWindow() {
 app.on('ready', () => {
   createWindow();
   if (!isDev) {
+    // TODO: this is crucial code! run express server if production mode
+    const express = require('./src/server/server');
     autoUpdater.checkForUpdates();
   }
 });

package.json

@@ -19,13 +19,13 @@
     "format": "prettier --write \"**/*.+(js|jsx| tsx| json|css|md)\"",
     "lint": "eslint .",
     "lint:fix": "eslint --fix . ",
-    "build": "concurrently --success first \"webpack --mode=production --config ./webpack.production.js\" \"nodemon ./src/server/server.js\"",
     "dev": "concurrently --success first \"webpack-dev-server --mode=development --config ./webpack.development.js\" \"nodemon ./src/server/server.js\"",
-    "prod": "concurrently --success first \"webpack --mode=production --config ./webpack.production.js && electron .\" \"nodemon ./src/server/server.js\"",
-    "package-mac": "npm run build && electron-builder build --x64 --mac",
-    "package-all": "npm run build && electron-builder build -mwl",
-    "package-win": "npm run build && electron-builder build --x64 --win",
-    "package-linux": "npm run build && electron-builder build --linux",
+    "build": "concurrently --success first \"webpack --mode=production --config ./webpack.production.js\"",
+    "prod": "concurrently --success first \"webpack --mode=production --config ./webpack.production.js && electron .\"",
+    "package-mac": "webpack --mode=production --config ./webpack.production.js && electron-builder build --x64 --mac",
+    "package-all": "webpack --mode=production --config ./webpack.production.js && electron-builder build -mwl",
+    "package-win": "webpack --mode=production --config ./webpack.production.js && electron-builder build --x64 --win",
+    "package-linux": "webpack --mode=production --config ./webpack.production.js && electron-builder build --linux",
     "gh-publish-mac": "electron-builder build --x64 --mac -p always",
     "gh-publish": "electron-builder build -mwl -p always",
     "check-types": "tsc",
@@ -55,7 +55,9 @@
       "main_process/main_touchbar.js",
       "main_process/SSEController.js",
       "main_process/main_testingController.js",
-      "preload.js"
+      "preload.js",
+      "src/server/server.js",
+      "src/server/controllers/authController.js"
     ],
     "nodeVersion": "16.15.0",
     "nsis": {