summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorTobias Järvelöv <tobias.jarvelov@mullvad.net>2025-02-10 10:14:14 +0100
committerMarkus Pettersson <markus.pettersson@mullvad.net>2025-02-25 12:51:51 +0100
commit3e36a49d1a2de315a052e19488b6749a5dbdd703 (patch)
treebbba96b8294b9747add8765bf405e0817e3e0a64
parent4ce11822f7308d75fce97acfc79fae2f9fc250ee (diff)
downloadmullvadvpn-3e36a49d1a2de315a052e19488b6749a5dbdd703.tar.xz
mullvadvpn-3e36a49d1a2de315a052e19488b6749a5dbdd703.zip
Fix typescript duplicate declaration errors
After replacing gulp with vite typescript now complains about duplicate names where e.g. a function and a type share the same name. To fix this we mark the imports with the type keyword to tell typescript that we're only using the types as that, types.
-rw-r--r--desktop/packages/mullvad-vpn/src/renderer/components/select-location/CustomLists.tsx6
-rw-r--r--desktop/packages/mullvad-vpn/src/renderer/components/select-location/RelayLocationList.tsx2
2 files changed, 6 insertions, 2 deletions
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/select-location/CustomLists.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/select-location/CustomLists.tsx
index 07dd98f19a..1b506bf3d0 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/select-location/CustomLists.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/select-location/CustomLists.tsx
@@ -1,7 +1,11 @@
import { useCallback, useEffect, useState } from 'react';
import styled from 'styled-components';
-import { CustomListError, CustomLists, RelayLocation } from '../../../shared/daemon-rpc-types';
+import {
+ CustomListError,
+ type CustomLists,
+ type RelayLocation,
+} from '../../../shared/daemon-rpc-types';
import { messages } from '../../../shared/gettext';
import log from '../../../shared/logging';
import { useAppContext } from '../../context';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/select-location/RelayLocationList.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/select-location/RelayLocationList.tsx
index 49e1f2a38c..9dfa8bf9f2 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/select-location/RelayLocationList.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/select-location/RelayLocationList.tsx
@@ -1,6 +1,6 @@
import React from 'react';
-import { RelayLocation } from '../../../shared/daemon-rpc-types';
+import { type RelayLocation } from '../../../shared/daemon-rpc-types';
import * as Cell from '../cell';
import LocationRow from './LocationRow';
import { getLocationChildren, LocationSpecification, RelayList } from './select-location-types';