Merge remote-tracking branch 'upstream/GRO-1245' into automate-builds

Author: nsrCodes

package.json

@@ -138,6 +138,10 @@
       {
         "from": "./release/app",
         "filter": "static/**"
+      },
+      {
+        "from": "./src/loadingScreen/",
+        "to": "loadingScreen"
       }
     ],
     "publish": {
@@ -221,6 +225,7 @@
     "@types/terser-webpack-plugin": "^5.0.4",
     "@types/uuid": "^10.0.0",
     "@types/webpack-env": "^1.16.3",
+    "@types/ws": "^8.5.13",
     "browserslist-config-erb": "^0.0.3",
     "chalk": "^4.1.2",
     "concurrently": "^6.3.0",
@@ -257,7 +262,8 @@
     "webpack-bundle-analyzer": "^4.5.0",
     "webpack-cli": "^4.9.0",
     "webpack-dev-server": "^4.3.1",
-    "webpack-merge": "^5.8.0"
+    "webpack-merge": "^5.8.0",
+    "source-map-support": "^0.5.21"
   },
   "dependencies": {
     "@devicefarmer/adbkit": "^3.2.6",
@@ -269,6 +275,7 @@
     "@sinclair/typebox": "^0.34.25",
     "@vscode/sudo-prompt": "^9.3.1",
     "address": "^2.0.3",
+    "agent-base": "^6.0.2",
     "assert": "^2.0.0",
     "async": "^3.2.1",
     "axios": "^0.28.0",

src/main/main.ts

@@ -429,7 +429,7 @@ app.on("ready", () => {
     }
   });
   loadingScreenWindow.loadURL(
-    `file://${path.resolve(__dirname, "../loadingScreen/", "index.html")}`
+    `file://${path.resolve(process.resourcesPath, "loadingScreen", "index.html")}`
   );
   loadingScreenWindow.show();
 });

src/renderer/actions/apps/os/proxy/index.js

@@ -1,7 +1,13 @@
 import { getCurrentProxyPort } from "renderer/actions/storage/cacheUtils";
 
-const { applyProxyOsx, removeProxyOsx } = require("./osx");
-const { applyProxyWindows, removeProxyWindows } = require("./windows");
+let applyProxyOsx, removeProxyOsx, applyProxyWindows, removeProxyWindows;
+
+if (process.platform === "darwin") {
+  ({ applyProxyOsx, removeProxyOsx } = require("./osx"));
+}
+else if (process.platform === "win32") {
+  ({ applyProxyWindows, removeProxyWindows } = require("./windows"));
+}
 
 const applyProxy = (port) => {
   const targetPort = port ? port : getCurrentProxyPort()