SaladBowl 2.0 - ELectron Edition (#217)

* Added electron-webpack to enable debugging of desktop-app


Trimmed down machine info only to required data


Initial version of electron salad bowl


Added sentry to desktop-app

* Fixed build issues when removing lerna

.gitignore

@@ -6,3 +6,5 @@ packages/desktop-app/dist/main\.js
 **/release/*
 
 packages/desktop-app/yarn-error\.log
+
+packages/desktop-app/dist/main/

.vscode/launch.json

@@ -14,6 +14,17 @@
       "sourceMapPathOverrides": {
         "webpack:///src/*": "${webRoot}/*"
       }
+    },
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Debug Desktop App",
+      "runtimeExecutable": "yarn",
+      "runtimeArgs": ["start"],
+      "autoAttachChildProcesses": true,
+      "internalConsoleOptions": "openOnFirstSessionStart",
+      "console": "integratedTerminal",
+      "cwd": "${workspaceRoot}/packages/desktop-app"
     }
   ]
 }

package.json

@@ -1,9 +1,6 @@
 {
   "name": "@saladtech/salad-applications",
   "private": true,
-  "workspaces": [
-    "packages/*"
-  ],
   "scripts": {
     "bootstrap": "lerna bootstrap",
     "build": "lerna run build",

packages/desktop-app/electron-builder.json

@@ -12,12 +12,12 @@
     "runAfterFinish": true,
     "allowToChangeInstallationDirectory": "true"
   },
-  "files": ["assets/*", "dist/*"],
+  "files": ["assets/*", "dist/main/*"],
   "win": {
     "icon": "assets/favicon.ico",
     "target": ["nsis"],
     "sign": "./sign.js",
-    "extraFiles": ["assets/*", "dist/salad-bowl"],
+    "extraFiles": ["assets/*"],
     "publish": {
       "provider": "s3",
       "bucket": "salad-app-releases"

packages/desktop-app/package.json

@@ -1,39 +1,58 @@
 {
   "name": "salad",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "Salad Technologies Desktop Application",
   "author": "Salad Technologies <[email protected]>",
   "homepage": "https://www.salad.io/",
   "license": "MIT",
-  "main": "dist/main.js",
+  "main": "dist/main/main.js",
   "files": [
     "lib"
   ],
   "scripts": {
-    "start": "yarn build && electron ./dist/main.js",
-    "build": "webpack --config webpack.config.js",
+    "start": "electron-webpack dev",
+    "build": "electron-webpack",
     "dist": "yarn build && electron-builder",
     "release": "yarn build && electron-builder --publish always"
   },
+  "electronWebpack": {
+    "title": true,
+    "staticSourceDirectory": "static",
+    "main": {
+      "extraEntries": [
+        "@/preload.js"
+      ],
+      "sourceDirectory": "src"
+    },
+    "renderer": {
+      "sourceDirectory": null
+    }
+  },
   "devDependencies": {
     "@types/electron": "^1.6.10",
-    "@types/node": "^11.11.5",
-    "electron": "^4.1.1",
-    "electron-builder": "^20.39.0",
-    "electron-reload": "^1.4.0",
-    "ts-loader": "^5.3.3",
-    "tslint": "^5.14.0",
+    "@types/node": "^12.12.3",
+    "electron": "^7.0.0",
+    "electron-builder": "^22.1.0",
+    "electron-reload": "^1.5.0",
+    "electron-webpack": "^2.7.4",
+    "electron-webpack-ts": "^3.2.0",
+    "ts-loader": "^6.2.1",
+    "tslint": "^5.20.0",
     "tslint-config-standard": "^8.0.1",
     "tslint-loader": "^3.5.4",
     "typescript": "^3.3.4000",
-    "webpack": "^4.29.6",
+    "webpack": "^4.41.2",
     "webpack-cli": "^3.3.0"
   },
   "dependencies": {
+    "@sentry/electron": "0.17.4",
     "auto-launch": "^5.0.5",
-    "electron-log": "^3.0.5",
-    "electron-updater": "^4.0.6",
+    "axios": "^0.19.0",
+    "decompress-zip": "^0.2.2",
+    "electron-log": "^3.0.8",
+    "electron-updater": "^4.2.0",
     "is-online": "^8.2.0",
-    "systeminformation": "^4.14.4"
+    "source-map-support": "^0.5.16",
+    "systeminformation": "^4.14.17"
   }
 }