diff options
author | Kristóf Marussy <kristof@marussy.com> | 2022-05-25 18:40:23 +0200 |
---|---|---|
committer | Kristóf Marussy <kristof@marussy.com> | 2022-05-26 15:49:18 +0200 |
commit | 8484d3262dfb4fedd8b83f65d053bc21e455008d (patch) | |
tree | 9020f95a13ddf11863b0541619dd57ca3f511104 /packages/renderer | |
parent | chore(deps): bump dependencies (diff) | |
download | sophie-8484d3262dfb4fedd8b83f65d053bc21e455008d.tar.gz sophie-8484d3262dfb4fedd8b83f65d053bc21e455008d.tar.zst sophie-8484d3262dfb4fedd8b83f65d053bc21e455008d.zip |
chore: use node16 moduleResolution where possible
We can't do this in the renderer package, because we need to import MUI
files that are not exported (MUI v6 is not ESM yet).
Signed-off-by: Kristóf Marussy <kristof@marussy.com>
Diffstat (limited to 'packages/renderer')
31 files changed, 83 insertions, 81 deletions
diff --git a/packages/renderer/src/components/App.tsx b/packages/renderer/src/components/App.tsx index 86e2a55..193afe6 100644 --- a/packages/renderer/src/components/App.tsx +++ b/packages/renderer/src/components/App.tsx | |||
@@ -23,11 +23,11 @@ import { styled } from '@mui/material/styles'; | |||
23 | import { observer } from 'mobx-react-lite'; | 23 | import { observer } from 'mobx-react-lite'; |
24 | import React, { useCallback } from 'react'; | 24 | import React, { useCallback } from 'react'; |
25 | 25 | ||
26 | import type RendererStore from '../stores/RendererStore'; | 26 | import type RendererStore from '../stores/RendererStore.js'; |
27 | 27 | ||
28 | import ServicePanel from './ServicePanel'; | 28 | import ServicePanel from './ServicePanel.js'; |
29 | import WindowTitle from './WindowTitle'; | 29 | import WindowTitle from './WindowTitle.js'; |
30 | import Sidebar from './sidebar/Sidebar'; | 30 | import Sidebar from './sidebar/Sidebar.js'; |
31 | 31 | ||
32 | const AppRoot = styled(Box)({ | 32 | const AppRoot = styled(Box)({ |
33 | display: 'flex', | 33 | display: 'flex', |
diff --git a/packages/renderer/src/components/BrowserViewPlaceholder.tsx b/packages/renderer/src/components/BrowserViewPlaceholder.tsx index 2bfc9b0..b309c4d 100644 --- a/packages/renderer/src/components/BrowserViewPlaceholder.tsx +++ b/packages/renderer/src/components/BrowserViewPlaceholder.tsx | |||
@@ -22,7 +22,7 @@ import Box from '@mui/material/Box'; | |||
22 | import throttle from 'lodash-es/throttle'; | 22 | import throttle from 'lodash-es/throttle'; |
23 | import React, { ReactNode, useCallback, useRef } from 'react'; | 23 | import React, { ReactNode, useCallback, useRef } from 'react'; |
24 | 24 | ||
25 | import Service from '../stores/Service'; | 25 | import Service from '../stores/Service.js'; |
26 | 26 | ||
27 | function BrowserViewPlaceholder({ | 27 | function BrowserViewPlaceholder({ |
28 | service, | 28 | service, |
diff --git a/packages/renderer/src/components/ServicePanel.tsx b/packages/renderer/src/components/ServicePanel.tsx index 2c79d99..507bc15 100644 --- a/packages/renderer/src/components/ServicePanel.tsx +++ b/packages/renderer/src/components/ServicePanel.tsx | |||
@@ -23,14 +23,14 @@ import { styled } from '@mui/material/styles'; | |||
23 | import { observer } from 'mobx-react-lite'; | 23 | import { observer } from 'mobx-react-lite'; |
24 | import React from 'react'; | 24 | import React from 'react'; |
25 | 25 | ||
26 | import type RendererStore from '../stores/RendererStore'; | 26 | import type RendererStore from '../stores/RendererStore.js'; |
27 | import Service from '../stores/Service'; | 27 | import Service from '../stores/Service.js'; |
28 | 28 | ||
29 | import BrowserViewPlaceholder from './BrowserViewPlaceholder'; | 29 | import BrowserViewPlaceholder from './BrowserViewPlaceholder.js'; |
30 | import InsecureConnectionBanner from './banner/InsecureConnectionBanner'; | 30 | import InsecureConnectionBanner from './banner/InsecureConnectionBanner.js'; |
31 | import NewWindowBanner from './banner/NewWindowBanner'; | 31 | import NewWindowBanner from './banner/NewWindowBanner.js'; |
32 | import ErrorPage from './errorPage/ErrorPage'; | 32 | import ErrorPage from './errorPage/ErrorPage.js'; |
33 | import LocationBar from './locationBar/LocationBar'; | 33 | import LocationBar from './locationBar/LocationBar.js'; |
34 | 34 | ||
35 | const ServicePanelRoot = styled(Box, { | 35 | const ServicePanelRoot = styled(Box, { |
36 | shouldForwardProp: (prop) => prop !== 'hidden', | 36 | shouldForwardProp: (prop) => prop !== 'hidden', |
diff --git a/packages/renderer/src/components/ThemeProvider.tsx b/packages/renderer/src/components/ThemeProvider.tsx index aa14039..50cc1c9 100644 --- a/packages/renderer/src/components/ThemeProvider.tsx +++ b/packages/renderer/src/components/ThemeProvider.tsx | |||
@@ -25,7 +25,7 @@ import { | |||
25 | import { observer } from 'mobx-react-lite'; | 25 | import { observer } from 'mobx-react-lite'; |
26 | import React, { type ReactNode } from 'react'; | 26 | import React, { type ReactNode } from 'react'; |
27 | 27 | ||
28 | import type RendererStore from '../stores/RendererStore'; | 28 | import type RendererStore from '../stores/RendererStore.js'; |
29 | 29 | ||
30 | function ThemeProvider({ | 30 | function ThemeProvider({ |
31 | children, | 31 | children, |
diff --git a/packages/renderer/src/components/WindowTitle.tsx b/packages/renderer/src/components/WindowTitle.tsx index 95e0fe6..fca8b4f 100644 --- a/packages/renderer/src/components/WindowTitle.tsx +++ b/packages/renderer/src/components/WindowTitle.tsx | |||
@@ -22,7 +22,7 @@ import { observer } from 'mobx-react-lite'; | |||
22 | import { useEffect } from 'react'; | 22 | import { useEffect } from 'react'; |
23 | import { useTranslation } from 'react-i18next'; | 23 | import { useTranslation } from 'react-i18next'; |
24 | 24 | ||
25 | import type Service from '../stores/Service'; | 25 | import type Service from '../stores/Service.js'; |
26 | 26 | ||
27 | function WindowTitle({ | 27 | function WindowTitle({ |
28 | selectedService, | 28 | selectedService, |
diff --git a/packages/renderer/src/components/banner/InsecureConnectionBanner.tsx b/packages/renderer/src/components/banner/InsecureConnectionBanner.tsx index 0b70db6..6165153 100644 --- a/packages/renderer/src/components/banner/InsecureConnectionBanner.tsx +++ b/packages/renderer/src/components/banner/InsecureConnectionBanner.tsx | |||
@@ -27,9 +27,9 @@ import { observer } from 'mobx-react-lite'; | |||
27 | import React from 'react'; | 27 | import React from 'react'; |
28 | import { useTranslation } from 'react-i18next'; | 28 | import { useTranslation } from 'react-i18next'; |
29 | 29 | ||
30 | import type Service from '../../stores/Service'; | 30 | import type Service from '../../stores/Service.js'; |
31 | 31 | ||
32 | import NotificationBanner from './NotificationBanner'; | 32 | import NotificationBanner from './NotificationBanner.js'; |
33 | 33 | ||
34 | function InsecureConnectionBanner({ | 34 | function InsecureConnectionBanner({ |
35 | service, | 35 | service, |
diff --git a/packages/renderer/src/components/banner/NewWindowBanner.tsx b/packages/renderer/src/components/banner/NewWindowBanner.tsx index ad9d07d..b9b0e4a 100644 --- a/packages/renderer/src/components/banner/NewWindowBanner.tsx +++ b/packages/renderer/src/components/banner/NewWindowBanner.tsx | |||
@@ -29,9 +29,9 @@ import { observer } from 'mobx-react-lite'; | |||
29 | import React from 'react'; | 29 | import React from 'react'; |
30 | import { Trans, useTranslation } from 'react-i18next'; | 30 | import { Trans, useTranslation } from 'react-i18next'; |
31 | 31 | ||
32 | import type Service from '../../stores/Service'; | 32 | import type Service from '../../stores/Service.js'; |
33 | 33 | ||
34 | import NotificationBanner from './NotificationBanner'; | 34 | import NotificationBanner from './NotificationBanner.js'; |
35 | 35 | ||
36 | function NewWindowBanner({ | 36 | function NewWindowBanner({ |
37 | service, | 37 | service, |
diff --git a/packages/renderer/src/components/banner/NotificationBanner.tsx b/packages/renderer/src/components/banner/NotificationBanner.tsx index 818f498..70fe693 100644 --- a/packages/renderer/src/components/banner/NotificationBanner.tsx +++ b/packages/renderer/src/components/banner/NotificationBanner.tsx | |||
@@ -18,9 +18,9 @@ | |||
18 | * SPDX-License-Identifier: AGPL-3.0-only | 18 | * SPDX-License-Identifier: AGPL-3.0-only |
19 | */ | 19 | */ |
20 | 20 | ||
21 | import { Typography } from '@mui/material'; | ||
22 | import Alert, { AlertColor } from '@mui/material/Alert'; | 21 | import Alert, { AlertColor } from '@mui/material/Alert'; |
23 | import Box from '@mui/material/Box'; | 22 | import Box from '@mui/material/Box'; |
23 | import Typography from '@mui/material/Typography'; | ||
24 | import { styled } from '@mui/material/styles'; | 24 | import { styled } from '@mui/material/styles'; |
25 | import React, { ReactNode } from 'react'; | 25 | import React, { ReactNode } from 'react'; |
26 | import { useTranslation } from 'react-i18next'; | 26 | import { useTranslation } from 'react-i18next'; |
diff --git a/packages/renderer/src/components/errorPage/CertificateDetails.tsx b/packages/renderer/src/components/errorPage/CertificateDetails.tsx index 51e7920..04d483e 100644 --- a/packages/renderer/src/components/errorPage/CertificateDetails.tsx +++ b/packages/renderer/src/components/errorPage/CertificateDetails.tsx | |||
@@ -32,10 +32,10 @@ import { observer } from 'mobx-react-lite'; | |||
32 | import React, { useState } from 'react'; | 32 | import React, { useState } from 'react'; |
33 | import { useTranslation } from 'react-i18next'; | 33 | import { useTranslation } from 'react-i18next'; |
34 | 34 | ||
35 | import type Service from '../../stores/Service'; | 35 | import type Service from '../../stores/Service.js'; |
36 | 36 | ||
37 | import SingleCertificateDetails from './SingleCertificateDetails'; | 37 | import SingleCertificateDetails from './SingleCertificateDetails.js'; |
38 | import TrustCertificateDialog from './TrustCertificateDialog'; | 38 | import TrustCertificateDialog from './TrustCertificateDialog.js'; |
39 | 39 | ||
40 | const SUMMARY_ID = 'Sophie-CertificateDetails-header'; | 40 | const SUMMARY_ID = 'Sophie-CertificateDetails-header'; |
41 | const DETAILS_ID = 'Sophie-CertificateDetails-content'; | 41 | const DETAILS_ID = 'Sophie-CertificateDetails-content'; |
diff --git a/packages/renderer/src/components/errorPage/ErrorPage.tsx b/packages/renderer/src/components/errorPage/ErrorPage.tsx index 10f54cd..dc01ddf 100644 --- a/packages/renderer/src/components/errorPage/ErrorPage.tsx +++ b/packages/renderer/src/components/errorPage/ErrorPage.tsx | |||
@@ -29,9 +29,9 @@ import { observer } from 'mobx-react-lite'; | |||
29 | import React from 'react'; | 29 | import React from 'react'; |
30 | import { useTranslation } from 'react-i18next'; | 30 | import { useTranslation } from 'react-i18next'; |
31 | 31 | ||
32 | import type Service from '../../stores/Service'; | 32 | import type Service from '../../stores/Service.js'; |
33 | 33 | ||
34 | import CertificateDetails from './CertificateDetails'; | 34 | import CertificateDetails from './CertificateDetails.js'; |
35 | 35 | ||
36 | interface ErrorDetails { | 36 | interface ErrorDetails { |
37 | icon: JSX.Element; | 37 | icon: JSX.Element; |
diff --git a/packages/renderer/src/components/locationBar/ExtraButtons.tsx b/packages/renderer/src/components/locationBar/ExtraButtons.tsx index 4d4c3c4..bea115d 100644 --- a/packages/renderer/src/components/locationBar/ExtraButtons.tsx +++ b/packages/renderer/src/components/locationBar/ExtraButtons.tsx | |||
@@ -25,7 +25,7 @@ import { observer } from 'mobx-react-lite'; | |||
25 | import React from 'react'; | 25 | import React from 'react'; |
26 | import { useTranslation } from 'react-i18next'; | 26 | import { useTranslation } from 'react-i18next'; |
27 | 27 | ||
28 | import type Service from '../../stores/Service'; | 28 | import type Service from '../../stores/Service.js'; |
29 | 29 | ||
30 | function ExtraButtons({ service }: { service: Service }): JSX.Element { | 30 | function ExtraButtons({ service }: { service: Service }): JSX.Element { |
31 | const { t } = useTranslation(undefined, { | 31 | const { t } = useTranslation(undefined, { |
diff --git a/packages/renderer/src/components/locationBar/GoButton.tsx b/packages/renderer/src/components/locationBar/GoButton.tsx index 471f25e..571124a 100644 --- a/packages/renderer/src/components/locationBar/GoButton.tsx +++ b/packages/renderer/src/components/locationBar/GoButton.tsx | |||
@@ -22,7 +22,7 @@ import IconGo from '@mui/icons-material/Send'; | |||
22 | import IconButton from '@mui/material/IconButton'; | 22 | import IconButton from '@mui/material/IconButton'; |
23 | import React, { MouseEventHandler } from 'react'; | 23 | import React, { MouseEventHandler } from 'react'; |
24 | 24 | ||
25 | import LocationInputAdornment from './LocationInputAdornment'; | 25 | import LocationInputAdornment from './LocationInputAdornment.js'; |
26 | 26 | ||
27 | export default function GoButton({ | 27 | export default function GoButton({ |
28 | onClick, | 28 | onClick, |
diff --git a/packages/renderer/src/components/locationBar/LocationBar.tsx b/packages/renderer/src/components/locationBar/LocationBar.tsx index 11981e9..fd7dcbb 100644 --- a/packages/renderer/src/components/locationBar/LocationBar.tsx +++ b/packages/renderer/src/components/locationBar/LocationBar.tsx | |||
@@ -22,12 +22,12 @@ import { styled } from '@mui/material/styles'; | |||
22 | import { observer } from 'mobx-react-lite'; | 22 | import { observer } from 'mobx-react-lite'; |
23 | import React from 'react'; | 23 | import React from 'react'; |
24 | 24 | ||
25 | import type RendererStore from '../../stores/RendererStore'; | 25 | import type RendererStore from '../../stores/RendererStore.js'; |
26 | import type Service from '../../stores/Service'; | 26 | import type Service from '../../stores/Service.js'; |
27 | 27 | ||
28 | import ExtraButtons from './ExtraButtons'; | 28 | import ExtraButtons from './ExtraButtons.js'; |
29 | import LocationTextField from './LocationTextField'; | 29 | import LocationTextField from './LocationTextField.js'; |
30 | import NavigationButtons from './NavigationButtons'; | 30 | import NavigationButtons from './NavigationButtons.js'; |
31 | 31 | ||
32 | export function getLocaltionBarID(service: Service): string { | 32 | export function getLocaltionBarID(service: Service): string { |
33 | return `Sophie-${service.id}-LocationBar`; | 33 | return `Sophie-${service.id}-LocationBar`; |
diff --git a/packages/renderer/src/components/locationBar/LocationTextField.tsx b/packages/renderer/src/components/locationBar/LocationTextField.tsx index 1d6b561..9b028b3 100644 --- a/packages/renderer/src/components/locationBar/LocationTextField.tsx +++ b/packages/renderer/src/components/locationBar/LocationTextField.tsx | |||
@@ -24,12 +24,12 @@ import { autorun } from 'mobx'; | |||
24 | import { observer } from 'mobx-react-lite'; | 24 | import { observer } from 'mobx-react-lite'; |
25 | import React, { useCallback, useEffect, useState } from 'react'; | 25 | import React, { useCallback, useEffect, useState } from 'react'; |
26 | 26 | ||
27 | import Service from '../../stores/Service'; | 27 | import Service from '../../stores/Service.js'; |
28 | 28 | ||
29 | import GoButton from './GoButton'; | 29 | import GoButton from './GoButton.js'; |
30 | import LocationOverlayInput from './LocationOverlayInput'; | 30 | import LocationOverlayInput from './LocationOverlayInput.js'; |
31 | import SecurityLabel from './SecurityLabel'; | 31 | import SecurityLabel from './SecurityLabel.js'; |
32 | import UrlOverlay from './UrlOverlay'; | 32 | import UrlOverlay from './UrlOverlay.js'; |
33 | 33 | ||
34 | const LocationTextFieldRoot = styled(FilledInput, { | 34 | const LocationTextFieldRoot = styled(FilledInput, { |
35 | name: 'LocationTextField', | 35 | name: 'LocationTextField', |
diff --git a/packages/renderer/src/components/locationBar/NavigationButtons.tsx b/packages/renderer/src/components/locationBar/NavigationButtons.tsx index 96e40e7..ab455eb 100644 --- a/packages/renderer/src/components/locationBar/NavigationButtons.tsx +++ b/packages/renderer/src/components/locationBar/NavigationButtons.tsx | |||
@@ -23,14 +23,14 @@ import IconArrowForward from '@mui/icons-material/ArrowForward'; | |||
23 | import IconStop from '@mui/icons-material/Close'; | 23 | import IconStop from '@mui/icons-material/Close'; |
24 | import IconHome from '@mui/icons-material/HomeOutlined'; | 24 | import IconHome from '@mui/icons-material/HomeOutlined'; |
25 | import IconRefresh from '@mui/icons-material/Refresh'; | 25 | import IconRefresh from '@mui/icons-material/Refresh'; |
26 | import { useTheme } from '@mui/material'; | ||
27 | import Box from '@mui/material/Box'; | 26 | import Box from '@mui/material/Box'; |
28 | import IconButton from '@mui/material/IconButton'; | 27 | import IconButton from '@mui/material/IconButton'; |
28 | import { useTheme } from '@mui/material/styles'; | ||
29 | import { observer } from 'mobx-react-lite'; | 29 | import { observer } from 'mobx-react-lite'; |
30 | import React from 'react'; | 30 | import React from 'react'; |
31 | import { useTranslation } from 'react-i18next'; | 31 | import { useTranslation } from 'react-i18next'; |
32 | 32 | ||
33 | import type Service from '../../stores/Service'; | 33 | import type Service from '../../stores/Service.js'; |
34 | 34 | ||
35 | function NavigationButtons({ service }: { service: Service }): JSX.Element { | 35 | function NavigationButtons({ service }: { service: Service }): JSX.Element { |
36 | const { t } = useTranslation(undefined, { | 36 | const { t } = useTranslation(undefined, { |
diff --git a/packages/renderer/src/components/locationBar/SecurityLabel.tsx b/packages/renderer/src/components/locationBar/SecurityLabel.tsx index ac51cff..7521fa6 100644 --- a/packages/renderer/src/components/locationBar/SecurityLabel.tsx +++ b/packages/renderer/src/components/locationBar/SecurityLabel.tsx | |||
@@ -27,8 +27,8 @@ import { SecurityLabelKind } from '@sophie/shared'; | |||
27 | import React from 'react'; | 27 | import React from 'react'; |
28 | import { useTranslation } from 'react-i18next'; | 28 | import { useTranslation } from 'react-i18next'; |
29 | 29 | ||
30 | import LocationInputAdornment from './LocationInputAdornment'; | 30 | import LocationInputAdornment from './LocationInputAdornment.js'; |
31 | import getAlertColor from './getAlertColor'; | 31 | import getAlertColor from './getAlertColor.js'; |
32 | 32 | ||
33 | const SecurityLabelRoot = styled(LocationInputAdornment, { | 33 | const SecurityLabelRoot = styled(LocationInputAdornment, { |
34 | name: 'SecurityLabel', | 34 | name: 'SecurityLabel', |
diff --git a/packages/renderer/src/components/locationBar/UrlOverlay.tsx b/packages/renderer/src/components/locationBar/UrlOverlay.tsx index a71fa4e..eaa86d2 100644 --- a/packages/renderer/src/components/locationBar/UrlOverlay.tsx +++ b/packages/renderer/src/components/locationBar/UrlOverlay.tsx | |||
@@ -21,7 +21,7 @@ | |||
21 | import { styled } from '@mui/material/styles'; | 21 | import { styled } from '@mui/material/styles'; |
22 | import React from 'react'; | 22 | import React from 'react'; |
23 | 23 | ||
24 | import getAlertColor from './getAlertColor'; | 24 | import getAlertColor from './getAlertColor.js'; |
25 | 25 | ||
26 | export type SplitResult = | 26 | export type SplitResult = |
27 | | { | 27 | | { |
diff --git a/packages/renderer/src/components/sidebar/ServiceIcon.tsx b/packages/renderer/src/components/sidebar/ServiceIcon.tsx index 7a6d58a..f3f025a 100644 --- a/packages/renderer/src/components/sidebar/ServiceIcon.tsx +++ b/packages/renderer/src/components/sidebar/ServiceIcon.tsx | |||
@@ -24,7 +24,7 @@ import { styled } from '@mui/material/styles'; | |||
24 | import { observer } from 'mobx-react-lite'; | 24 | import { observer } from 'mobx-react-lite'; |
25 | import React, { useEffect, useState } from 'react'; | 25 | import React, { useEffect, useState } from 'react'; |
26 | 26 | ||
27 | import type Service from '../../stores/Service'; | 27 | import type Service from '../../stores/Service.js'; |
28 | 28 | ||
29 | const ServiceIconRoot = styled('div', { | 29 | const ServiceIconRoot = styled('div', { |
30 | name: 'ServiceIcon', | 30 | name: 'ServiceIcon', |
diff --git a/packages/renderer/src/components/sidebar/ServiceSwitcher.tsx b/packages/renderer/src/components/sidebar/ServiceSwitcher.tsx index 7aa9124..56487df 100644 --- a/packages/renderer/src/components/sidebar/ServiceSwitcher.tsx +++ b/packages/renderer/src/components/sidebar/ServiceSwitcher.tsx | |||
@@ -26,11 +26,11 @@ import { observer } from 'mobx-react-lite'; | |||
26 | import React from 'react'; | 26 | import React from 'react'; |
27 | import { useTranslation } from 'react-i18next'; | 27 | import { useTranslation } from 'react-i18next'; |
28 | 28 | ||
29 | import type RendererStore from '../../stores/RendererStore'; | 29 | import type RendererStore from '../../stores/RendererStore.js'; |
30 | import type Service from '../../stores/Service'; | 30 | import type Service from '../../stores/Service.js'; |
31 | import { getServicePanelID } from '../ServicePanel'; | 31 | import { getServicePanelID } from '../ServicePanel.js'; |
32 | 32 | ||
33 | import ServiceIcon from './ServiceIcon'; | 33 | import ServiceIcon from './ServiceIcon.js'; |
34 | 34 | ||
35 | const ServiceSwitcherRoot = styled(Tabs, { | 35 | const ServiceSwitcherRoot = styled(Tabs, { |
36 | name: 'ServiceSwitcher', | 36 | name: 'ServiceSwitcher', |
diff --git a/packages/renderer/src/components/sidebar/Sidebar.tsx b/packages/renderer/src/components/sidebar/Sidebar.tsx index 6c802ac..7308900 100644 --- a/packages/renderer/src/components/sidebar/Sidebar.tsx +++ b/packages/renderer/src/components/sidebar/Sidebar.tsx | |||
@@ -22,11 +22,11 @@ import Box from '@mui/material/Box'; | |||
22 | import { styled } from '@mui/material/styles'; | 22 | import { styled } from '@mui/material/styles'; |
23 | import React from 'react'; | 23 | import React from 'react'; |
24 | 24 | ||
25 | import RendererStore from '../../stores/RendererStore'; | 25 | import RendererStore from '../../stores/RendererStore.js'; |
26 | 26 | ||
27 | import ServiceSwitcher from './ServiceSwitcher'; | 27 | import ServiceSwitcher from './ServiceSwitcher.js'; |
28 | import ToggleDarkModeButton from './ToggleDarkModeButton'; | 28 | import ToggleDarkModeButton from './ToggleDarkModeButton.js'; |
29 | import ToggleLocationBarButton from './ToggleLocationBarButton'; | 29 | import ToggleLocationBarButton from './ToggleLocationBarButton.js'; |
30 | 30 | ||
31 | const SidebarRoot = styled(Box)(({ theme }) => ({ | 31 | const SidebarRoot = styled(Box)(({ theme }) => ({ |
32 | flex: 0, | 32 | flex: 0, |
diff --git a/packages/renderer/src/components/sidebar/ToggleDarkModeButton.tsx b/packages/renderer/src/components/sidebar/ToggleDarkModeButton.tsx index a922389..5e15d4b 100644 --- a/packages/renderer/src/components/sidebar/ToggleDarkModeButton.tsx +++ b/packages/renderer/src/components/sidebar/ToggleDarkModeButton.tsx | |||
@@ -25,7 +25,7 @@ import { observer } from 'mobx-react-lite'; | |||
25 | import React from 'react'; | 25 | import React from 'react'; |
26 | import { useTranslation } from 'react-i18next'; | 26 | import { useTranslation } from 'react-i18next'; |
27 | 27 | ||
28 | import type RendererStore from '../../stores/RendererStore'; | 28 | import type RendererStore from '../../stores/RendererStore.js'; |
29 | 29 | ||
30 | function ToggleDarkModeButton({ | 30 | function ToggleDarkModeButton({ |
31 | store: { shared }, | 31 | store: { shared }, |
diff --git a/packages/renderer/src/components/sidebar/ToggleLocationBarButton.tsx b/packages/renderer/src/components/sidebar/ToggleLocationBarButton.tsx index b6644a3..64b4ca9 100644 --- a/packages/renderer/src/components/sidebar/ToggleLocationBarButton.tsx +++ b/packages/renderer/src/components/sidebar/ToggleLocationBarButton.tsx | |||
@@ -20,15 +20,15 @@ | |||
20 | 20 | ||
21 | import IconChevronLeft from '@mui/icons-material/KeyboardDoubleArrowLeft'; | 21 | import IconChevronLeft from '@mui/icons-material/KeyboardDoubleArrowLeft'; |
22 | import IconChevronRight from '@mui/icons-material/KeyboardDoubleArrowRight'; | 22 | import IconChevronRight from '@mui/icons-material/KeyboardDoubleArrowRight'; |
23 | import { useTheme } from '@mui/material'; | ||
24 | import CircularProgress from '@mui/material/CircularProgress'; | 23 | import CircularProgress from '@mui/material/CircularProgress'; |
25 | import IconButton from '@mui/material/IconButton'; | 24 | import IconButton from '@mui/material/IconButton'; |
25 | import { useTheme } from '@mui/material/styles'; | ||
26 | import { observer } from 'mobx-react-lite'; | 26 | import { observer } from 'mobx-react-lite'; |
27 | import React from 'react'; | 27 | import React from 'react'; |
28 | import { useTranslation } from 'react-i18next'; | 28 | import { useTranslation } from 'react-i18next'; |
29 | 29 | ||
30 | import type RendererStore from '../../stores/RendererStore'; | 30 | import type RendererStore from '../../stores/RendererStore.js'; |
31 | import { getLocaltionBarID } from '../locationBar/LocationBar'; | 31 | import { getLocaltionBarID } from '../locationBar/LocationBar.js'; |
32 | 32 | ||
33 | function ToggleLocationBarIcon({ | 33 | function ToggleLocationBarIcon({ |
34 | loading, | 34 | loading, |
diff --git a/packages/renderer/src/i18n/RtlCacheProvider.tsx b/packages/renderer/src/i18n/RtlCacheProvider.tsx index 1303314..8b6fcf2 100644 --- a/packages/renderer/src/i18n/RtlCacheProvider.tsx +++ b/packages/renderer/src/i18n/RtlCacheProvider.tsx | |||
@@ -23,7 +23,7 @@ import { CacheProvider } from '@emotion/react'; | |||
23 | import { observer } from 'mobx-react-lite'; | 23 | import { observer } from 'mobx-react-lite'; |
24 | import React, { type ReactNode } from 'react'; | 24 | import React, { type ReactNode } from 'react'; |
25 | 25 | ||
26 | import type RendererStore from '../stores/RendererStore'; | 26 | import type RendererStore from '../stores/RendererStore.js'; |
27 | 27 | ||
28 | function RtlCacheProvider({ | 28 | function RtlCacheProvider({ |
29 | children, | 29 | children, |
diff --git a/packages/renderer/src/i18n/loadRendererLoalization.ts b/packages/renderer/src/i18n/loadRendererLoalization.ts index 4d7b84a..d3ad252 100644 --- a/packages/renderer/src/i18n/loadRendererLoalization.ts +++ b/packages/renderer/src/i18n/loadRendererLoalization.ts | |||
@@ -24,10 +24,10 @@ import { reaction } from 'mobx'; | |||
24 | import { addDisposer } from 'mobx-state-tree'; | 24 | import { addDisposer } from 'mobx-state-tree'; |
25 | import { initReactI18next } from 'react-i18next'; | 25 | import { initReactI18next } from 'react-i18next'; |
26 | 26 | ||
27 | import RendererStore from '../stores/RendererStore'; | 27 | import RendererStore from '../stores/RendererStore.js'; |
28 | import { getLogger } from '../utils/log'; | 28 | import { getLogger } from '../utils/log.js'; |
29 | 29 | ||
30 | import RendererIpcI18nBackend from './RendererIpcI18nBackend'; | 30 | import RendererIpcI18nBackend from './RendererIpcI18nBackend.js'; |
31 | 31 | ||
32 | const log = getLogger('loadRendererLocalization'); | 32 | const log = getLogger('loadRendererLocalization'); |
33 | 33 | ||
diff --git a/packages/renderer/src/index.tsx b/packages/renderer/src/index.tsx index 980e4dd..32fcee6 100644 --- a/packages/renderer/src/index.tsx +++ b/packages/renderer/src/index.tsx | |||
@@ -25,14 +25,14 @@ import React, { Suspense, lazy } from 'react'; | |||
25 | import { createRoot } from 'react-dom/client'; | 25 | import { createRoot } from 'react-dom/client'; |
26 | 26 | ||
27 | import './style.css'; | 27 | import './style.css'; |
28 | import Loading from './components/Loading'; | 28 | import Loading from './components/Loading.js'; |
29 | import ThemeProvider from './components/ThemeProvider'; | 29 | import ThemeProvider from './components/ThemeProvider.js'; |
30 | import { exposeToReduxDevtools, hotReload } from './devTools'; | 30 | import { exposeToReduxDevtools, hotReload } from './devTools.js'; |
31 | import RtlCacheProvider from './i18n/RtlCacheProvider'; | 31 | import RtlCacheProvider from './i18n/RtlCacheProvider.js'; |
32 | import createRtlCache from './i18n/createRtlCache'; | 32 | import createRtlCache from './i18n/createRtlCache.js'; |
33 | import loadRendererLocalization from './i18n/loadRendererLoalization'; | 33 | import loadRendererLocalization from './i18n/loadRendererLoalization.js'; |
34 | import { createAndConnectRendererStore } from './stores/RendererStore'; | 34 | import { createAndConnectRendererStore } from './stores/RendererStore.js'; |
35 | import { getLogger } from './utils/log'; | 35 | import { getLogger } from './utils/log.js'; |
36 | 36 | ||
37 | const isDevelopment = import.meta.env.MODE === 'development'; | 37 | const isDevelopment = import.meta.env.MODE === 'development'; |
38 | 38 | ||
@@ -65,7 +65,7 @@ addDisposer(store, disposeSetHtmlLang); | |||
65 | 65 | ||
66 | const rtlCache = createRtlCache(); | 66 | const rtlCache = createRtlCache(); |
67 | 67 | ||
68 | const App = lazy(() => import('./components/App')); | 68 | const App = lazy(() => import('./components/App.js')); |
69 | 69 | ||
70 | function Root(): JSX.Element { | 70 | function Root(): JSX.Element { |
71 | return ( | 71 | return ( |
diff --git a/packages/renderer/src/stores/GlobalSettings.ts b/packages/renderer/src/stores/GlobalSettings.ts index 52971d4..11c2ebd 100644 --- a/packages/renderer/src/stores/GlobalSettings.ts +++ b/packages/renderer/src/stores/GlobalSettings.ts | |||
@@ -21,8 +21,8 @@ | |||
21 | import { defineGlobalSettingsModel, ThemeSource } from '@sophie/shared'; | 21 | import { defineGlobalSettingsModel, ThemeSource } from '@sophie/shared'; |
22 | import { Instance } from 'mobx-state-tree'; | 22 | import { Instance } from 'mobx-state-tree'; |
23 | 23 | ||
24 | import { getEnv } from './RendererEnv'; | 24 | import { getEnv } from './RendererEnv.js'; |
25 | import Service from './Service'; | 25 | import Service from './Service.js'; |
26 | 26 | ||
27 | const GlobalSettings = defineGlobalSettingsModel(Service).actions((self) => ({ | 27 | const GlobalSettings = defineGlobalSettingsModel(Service).actions((self) => ({ |
28 | setSelectedServiceId(serviceId: string): void { | 28 | setSelectedServiceId(serviceId: string): void { |
diff --git a/packages/renderer/src/stores/RendererStore.ts b/packages/renderer/src/stores/RendererStore.ts index a3983ca..c4110bd 100644 --- a/packages/renderer/src/stores/RendererStore.ts +++ b/packages/renderer/src/stores/RendererStore.ts | |||
@@ -21,12 +21,12 @@ | |||
21 | import type { SophieRenderer } from '@sophie/shared'; | 21 | import type { SophieRenderer } from '@sophie/shared'; |
22 | import { applySnapshot, applyPatch, Instance, types } from 'mobx-state-tree'; | 22 | import { applySnapshot, applyPatch, Instance, types } from 'mobx-state-tree'; |
23 | 23 | ||
24 | import { getLogger } from '../utils/log'; | 24 | import { getLogger } from '../utils/log.js'; |
25 | 25 | ||
26 | import type GlobalSettings from './GlobalSettings'; | 26 | import type GlobalSettings from './GlobalSettings.js'; |
27 | import type RendererEnv from './RendererEnv'; | 27 | import type RendererEnv from './RendererEnv.js'; |
28 | import type Service from './Service'; | 28 | import type Service from './Service.js'; |
29 | import SharedStore from './SharedStore'; | 29 | import SharedStore from './SharedStore.js'; |
30 | 30 | ||
31 | const log = getLogger('RendererStore'); | 31 | const log = getLogger('RendererStore'); |
32 | 32 | ||
diff --git a/packages/renderer/src/stores/Service.ts b/packages/renderer/src/stores/Service.ts index c8d513f..ff01964 100644 --- a/packages/renderer/src/stores/Service.ts +++ b/packages/renderer/src/stores/Service.ts | |||
@@ -25,8 +25,8 @@ import { | |||
25 | } from '@sophie/shared'; | 25 | } from '@sophie/shared'; |
26 | import { Instance } from 'mobx-state-tree'; | 26 | import { Instance } from 'mobx-state-tree'; |
27 | 27 | ||
28 | import { getEnv } from './RendererEnv'; | 28 | import { getEnv } from './RendererEnv.js'; |
29 | import ServiceSettings from './ServiceSettings'; | 29 | import ServiceSettings from './ServiceSettings.js'; |
30 | 30 | ||
31 | const Service = defineServiceModel(ServiceSettings) | 31 | const Service = defineServiceModel(ServiceSettings) |
32 | .views((self) => ({ | 32 | .views((self) => ({ |
diff --git a/packages/renderer/src/stores/ServiceSettings.ts b/packages/renderer/src/stores/ServiceSettings.ts index 5d37347..d5c2843 100644 --- a/packages/renderer/src/stores/ServiceSettings.ts +++ b/packages/renderer/src/stores/ServiceSettings.ts | |||
@@ -21,7 +21,7 @@ | |||
21 | import { defineServiceSettingsModel } from '@sophie/shared'; | 21 | import { defineServiceSettingsModel } from '@sophie/shared'; |
22 | import { Instance } from 'mobx-state-tree'; | 22 | import { Instance } from 'mobx-state-tree'; |
23 | 23 | ||
24 | import Profile from './Profile'; | 24 | import Profile from './Profile.js'; |
25 | 25 | ||
26 | const ServiceSettings = defineServiceSettingsModel(Profile); | 26 | const ServiceSettings = defineServiceSettingsModel(Profile); |
27 | 27 | ||
diff --git a/packages/renderer/src/stores/SharedStore.ts b/packages/renderer/src/stores/SharedStore.ts index 062479d..0b04a86 100644 --- a/packages/renderer/src/stores/SharedStore.ts +++ b/packages/renderer/src/stores/SharedStore.ts | |||
@@ -21,9 +21,9 @@ | |||
21 | import { defineSharedStoreModel } from '@sophie/shared'; | 21 | import { defineSharedStoreModel } from '@sophie/shared'; |
22 | import { Instance } from 'mobx-state-tree'; | 22 | import { Instance } from 'mobx-state-tree'; |
23 | 23 | ||
24 | import GlobalSettings from './GlobalSettings'; | 24 | import GlobalSettings from './GlobalSettings.js'; |
25 | import Profile from './Profile'; | 25 | import Profile from './Profile.js'; |
26 | import Service from './Service'; | 26 | import Service from './Service.js'; |
27 | 27 | ||
28 | const SharedStore = defineSharedStoreModel( | 28 | const SharedStore = defineSharedStoreModel( |
29 | GlobalSettings, | 29 | GlobalSettings, |
diff --git a/packages/renderer/tsconfig.json b/packages/renderer/tsconfig.json index 4fe3896..3b576a8 100644 --- a/packages/renderer/tsconfig.json +++ b/packages/renderer/tsconfig.json | |||
@@ -2,8 +2,10 @@ | |||
2 | "extends": "../../config/tsconfig.base.json", | 2 | "extends": "../../config/tsconfig.base.json", |
3 | "compilerOptions": { | 3 | "compilerOptions": { |
4 | "noEmit": true, | 4 | "noEmit": true, |
5 | "module": "es2022", | ||
6 | "moduleResolution": "node", | ||
5 | "jsx": "react", | 7 | "jsx": "react", |
6 | "lib": ["dom", "dom.iterable", "esnext"], | 8 | "lib": ["dom", "dom.iterable", "es2021"], |
7 | "types": ["@types/jest", "vite/client"] | 9 | "types": ["@types/jest", "vite/client"] |
8 | }, | 10 | }, |
9 | "references": [ | 11 | "references": [ |