summaryrefslogtreecommitdiffhomepage
path: root/desktop
diff options
context:
space:
mode:
authorTobias Järvelöv <tobias.jarvelov@mullvad.net>2025-02-10 12:54:52 +0100
committerMarkus Pettersson <markus.pettersson@mullvad.net>2025-02-25 12:51:51 +0100
commitd43b7acfdcf3252c8c22626d5305bb100aac37ed (patch)
tree2886c4be709d57ce5882cc1bd0e85e44f9a83ab2 /desktop
parent9115e080a947f69195bd1d6de07e37dc846023dc (diff)
downloadmullvadvpn-d43b7acfdcf3252c8c22626d5305bb100aac37ed.tar.xz
mullvadvpn-d43b7acfdcf3252c8c22626d5305bb100aac37ed.zip
Allow requests to vite dev server in dev mode
Diffstat (limited to 'desktop')
-rw-r--r--desktop/packages/mullvad-vpn/src/main/index.ts14
1 files changed, 13 insertions, 1 deletions
diff --git a/desktop/packages/mullvad-vpn/src/main/index.ts b/desktop/packages/mullvad-vpn/src/main/index.ts
index b07d1697f6..6528cc7c71 100644
--- a/desktop/packages/mullvad-vpn/src/main/index.ts
+++ b/desktop/packages/mullvad-vpn/src/main/index.ts
@@ -992,6 +992,18 @@ class ApplicationMain
private allowDevelopmentRequest(url: string): boolean {
if (process.env.NODE_ENV === 'development') {
+ const isViteDevServerRequest = (url: string): boolean => {
+ if (process.env.VITE_DEV_SERVER_URL) {
+ const viteDevServerUrl = new URL(process.env.VITE_DEV_SERVER_URL);
+ const viteDevServerUrlWs = new URL(viteDevServerUrl);
+ viteDevServerUrlWs.protocol = 'ws';
+
+ return url.startsWith(viteDevServerUrl.href) || url.startsWith(viteDevServerUrlWs.href);
+ }
+
+ return false;
+ };
+
const isDevtoolsRequest = (url: string): boolean => {
// Downloading of React and Redux developer tools.
const devtoolsUrls = [
@@ -1004,7 +1016,7 @@ class ApplicationMain
return devtoolsUrls.some((devtoolsUrl) => url.startsWith(devtoolsUrl));
};
- return isDevtoolsRequest(url);
+ return isViteDevServerRequest(url) || isDevtoolsRequest(url);
}
return false;