Skip to content

Commit eb18a0f

Browse files
committed
FIx linux pipeline
1 parent 22d95f0 commit eb18a0f

File tree

3 files changed

+18
-5
lines changed

3 files changed

+18
-5
lines changed

package.json

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,10 @@
133133
{
134134
"from": "./release/app",
135135
"filter": "static/**"
136+
},
137+
{
138+
"from": "./src/loadingScreen/",
139+
"to": "loadingScreen"
136140
}
137141
],
138142
"publish": {
@@ -213,6 +217,7 @@
213217
"@types/node-forge": "^1.3.11",
214218
"@types/terser-webpack-plugin": "^5.0.4",
215219
"@types/webpack-env": "^1.16.3",
220+
"@types/ws": "^8.5.13",
216221
"browserslist-config-erb": "^0.0.3",
217222
"chalk": "^4.1.2",
218223
"concurrently": "^6.3.0",
@@ -249,7 +254,8 @@
249254
"webpack-bundle-analyzer": "^4.5.0",
250255
"webpack-cli": "^4.9.0",
251256
"webpack-dev-server": "^4.3.1",
252-
"webpack-merge": "^5.8.0"
257+
"webpack-merge": "^5.8.0",
258+
"source-map-support": "^0.5.21"
253259
},
254260
"dependencies": {
255261
"@devicefarmer/adbkit": "^3.2.6",
@@ -259,6 +265,7 @@
259265
"@sentry/browser": "^8.34.0",
260266
"@sentry/electron": "^5.6.0",
261267
"address": "^2.0.3",
268+
"agent-base": "^6.0.2",
262269
"assert": "^2.0.0",
263270
"async": "^3.2.1",
264271
"axios": "^0.28.0",
@@ -329,4 +336,4 @@
329336
"pre-commit": "lint-staged"
330337
}
331338
}
332-
}
339+
}

src/main/main.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ app.on("ready", () => {
429429
}
430430
});
431431
loadingScreenWindow.loadURL(
432-
`file://${path.resolve(__dirname, "../loadingScreen/", "index.html")}`
432+
`file://${path.resolve(process.resourcesPath, "loadingScreen", "index.html")}`
433433
);
434434
loadingScreenWindow.show();
435435
});

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
import { getCurrentProxyPort } from "renderer/actions/storage/cacheUtils";
22

3-
const { applyProxyOsx, removeProxyOsx } = require("./osx");
4-
const { applyProxyWindows, removeProxyWindows } = require("./windows");
3+
let applyProxyOsx, removeProxyOsx, applyProxyWindows, removeProxyWindows;
4+
5+
if (process.platform === "darwin") {
6+
({ applyProxyOsx, removeProxyOsx } = require("./osx"));
7+
}
8+
else if (process.platform === "win32") {
9+
({ applyProxyWindows, removeProxyWindows } = require("./windows"));
10+
}
511

612
const applyProxy = (port) => {
713
const targetPort = port ? port : getCurrentProxyPort()

0 commit comments

Comments
 (0)