From 4151e020f6201480f773018ccd6e3d8bc600c348 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Tue, 8 Mar 2022 21:58:40 -0800 Subject: [PATCH] Revert "xo: Fix import/extensions." This reverts commit 5623ab3866a39dd8d9ebb9499afd218195bd8e99. Signed-off-by: Anders Kaseorg --- app/common/config-util.ts | 8 ++--- app/common/default-util.ts | 2 +- app/common/dnd-util.ts | 4 +-- app/common/enterprise-util.ts | 4 +-- app/common/logger-util.ts | 4 +-- app/common/translation-util.ts | 2 +- app/common/typed-ipc.ts | 4 +-- app/main/autoupdater.ts | 4 +-- app/main/badge-settings.ts | 4 +-- app/main/index.ts | 20 +++++------ app/main/linux-update-util.ts | 2 +- app/main/linuxupdater.ts | 8 ++--- app/main/menu.ts | 14 ++++---- app/main/request.ts | 6 ++-- app/main/sentry.ts | 2 +- app/main/startup.ts | 2 +- app/renderer/js/components/base.ts | 2 +- app/renderer/js/components/context-menu.ts | 2 +- app/renderer/js/components/functional-tab.ts | 10 +++--- .../js/components/handle-external-link.ts | 8 ++--- app/renderer/js/components/server-tab.ts | 14 ++++---- app/renderer/js/components/tab.ts | 2 +- app/renderer/js/components/webview.ts | 20 +++++------ app/renderer/js/electron-bridge.ts | 10 +++--- app/renderer/js/main.ts | 36 +++++++++---------- app/renderer/js/notification/index.ts | 2 +- app/renderer/js/pages/about.ts | 2 +- app/renderer/js/pages/network.ts | 2 +- .../js/pages/preference/base-section.ts | 8 ++--- .../pages/preference/connected-org-section.ts | 14 ++++---- .../js/pages/preference/find-accounts.ts | 8 ++--- .../js/pages/preference/general-section.ts | 12 +++---- app/renderer/js/pages/preference/nav.ts | 10 +++--- .../js/pages/preference/network-section.ts | 10 +++--- .../js/pages/preference/new-server-form.ts | 12 +++---- .../js/pages/preference/preference.ts | 20 +++++------ .../js/pages/preference/server-info-form.ts | 14 ++++---- .../js/pages/preference/servers-section.ts | 8 ++--- .../js/pages/preference/shortcuts-section.ts | 6 ++-- app/renderer/js/preload.ts | 6 ++-- app/renderer/js/tray.ts | 8 ++--- app/renderer/js/utils/domain-util.ts | 10 +++--- app/renderer/js/utils/link-util.ts | 2 +- app/renderer/js/utils/reconnect-util.ts | 8 ++--- app/renderer/js/utils/system-util.ts | 2 +- 45 files changed, 179 insertions(+), 179 deletions(-) diff --git a/app/common/config-util.ts b/app/common/config-util.ts index 7ebb83a1..8c624ce6 100644 --- a/app/common/config-util.ts +++ b/app/common/config-util.ts @@ -6,10 +6,10 @@ import {JsonDB} from "node-json-db"; import {DataError} from "node-json-db/dist/lib/Errors"; import type * as z from "zod"; -import {configSchemata} from "./config-schemata.js"; -import * as EnterpriseUtil from "./enterprise-util.js"; -import Logger from "./logger-util.js"; -import {app, dialog} from "./remote.js"; +import {configSchemata} from "./config-schemata"; +import * as EnterpriseUtil from "./enterprise-util"; +import Logger from "./logger-util"; +import {app, dialog} from "./remote"; export type Config = { [Key in keyof typeof configSchemata]: z.output; diff --git a/app/common/default-util.ts b/app/common/default-util.ts index 2d001420..5256dc31 100644 --- a/app/common/default-util.ts +++ b/app/common/default-util.ts @@ -1,6 +1,6 @@ import fs from "fs"; -import {app} from "./remote.js"; +import {app} from "./remote"; let setupCompleted = false; diff --git a/app/common/dnd-util.ts b/app/common/dnd-util.ts index 3bfca50a..32eb3799 100644 --- a/app/common/dnd-util.ts +++ b/app/common/dnd-util.ts @@ -1,7 +1,7 @@ import type * as z from "zod"; -import type {dndSettingsSchemata} from "./config-schemata.js"; -import * as ConfigUtil from "./config-util.js"; +import type {dndSettingsSchemata} from "./config-schemata"; +import * as ConfigUtil from "./config-util"; export type DndSettings = { [Key in keyof typeof dndSettingsSchemata]: z.output< diff --git a/app/common/enterprise-util.ts b/app/common/enterprise-util.ts index b3ca7e6d..3f2b7de1 100644 --- a/app/common/enterprise-util.ts +++ b/app/common/enterprise-util.ts @@ -3,8 +3,8 @@ import path from "path"; import * as z from "zod"; -import {enterpriseConfigSchemata} from "./config-schemata.js"; -import Logger from "./logger-util.js"; +import {enterpriseConfigSchemata} from "./config-schemata"; +import Logger from "./logger-util"; type EnterpriseConfig = { [Key in keyof typeof enterpriseConfigSchemata]: z.output< diff --git a/app/common/logger-util.ts b/app/common/logger-util.ts index cd9248e1..38948f82 100644 --- a/app/common/logger-util.ts +++ b/app/common/logger-util.ts @@ -2,8 +2,8 @@ import {Console} from "console"; // eslint-disable-line node/prefer-global/conso import fs from "fs"; import os from "os"; -import {initSetUp} from "./default-util.js"; -import {app} from "./remote.js"; +import {initSetUp} from "./default-util"; +import {app} from "./remote"; interface LoggerOptions { file?: string; diff --git a/app/common/translation-util.ts b/app/common/translation-util.ts index 7100228f..005e4463 100644 --- a/app/common/translation-util.ts +++ b/app/common/translation-util.ts @@ -2,7 +2,7 @@ import path from "path"; import i18n from "i18n"; -import * as ConfigUtil from "./config-util.js"; +import * as ConfigUtil from "./config-util"; i18n.configure({ directory: path.join(__dirname, "../translations/"), diff --git a/app/common/typed-ipc.ts b/app/common/typed-ipc.ts index 47f05d6b..5dd58807 100644 --- a/app/common/typed-ipc.ts +++ b/app/common/typed-ipc.ts @@ -1,5 +1,5 @@ -import type {DndSettings} from "./dnd-util.js"; -import type {MenuProps, ServerConf} from "./types.js"; +import type {DndSettings} from "./dnd-util"; +import type {MenuProps, ServerConf} from "./types"; export interface MainMessage { "clear-app-settings": () => void; diff --git a/app/main/autoupdater.ts b/app/main/autoupdater.ts index dd1ef671..75c01511 100644 --- a/app/main/autoupdater.ts +++ b/app/main/autoupdater.ts @@ -5,9 +5,9 @@ import log from "electron-log"; import type {UpdateDownloadedEvent, UpdateInfo} from "electron-updater"; import {autoUpdater} from "electron-updater"; -import * as ConfigUtil from "../common/config-util.js"; +import * as ConfigUtil from "../common/config-util"; -import {linuxUpdateNotification} from "./linuxupdater.js"; // Required only in case of linux +import {linuxUpdateNotification} from "./linuxupdater"; // Required only in case of linux const sleep = util.promisify(setTimeout); diff --git a/app/main/badge-settings.ts b/app/main/badge-settings.ts index c6a9704b..9c4d58ec 100644 --- a/app/main/badge-settings.ts +++ b/app/main/badge-settings.ts @@ -1,8 +1,8 @@ import electron, {app} from "electron"; -import * as ConfigUtil from "../common/config-util.js"; +import * as ConfigUtil from "../common/config-util"; -import {send} from "./typed-ipc-main.js"; +import {send} from "./typed-ipc-main"; function showBadgeCount( messageCount: number, diff --git a/app/main/index.ts b/app/main/index.ts index c695a02e..3992548e 100644 --- a/app/main/index.ts +++ b/app/main/index.ts @@ -5,17 +5,17 @@ import path from "path"; import * as remoteMain from "@electron/remote/main"; import windowStateKeeper from "electron-window-state"; -import * as ConfigUtil from "../common/config-util.js"; -import type {RendererMessage} from "../common/typed-ipc.js"; -import type {MenuProps} from "../common/types.js"; +import * as ConfigUtil from "../common/config-util"; +import type {RendererMessage} from "../common/typed-ipc"; +import type {MenuProps} from "../common/types"; -import {appUpdater} from "./autoupdater.js"; -import * as BadgeSettings from "./badge-settings.js"; -import * as AppMenu from "./menu.js"; -import {_getServerSettings, _isOnline, _saveServerIcon} from "./request.js"; -import {sentryInit} from "./sentry.js"; -import {setAutoLaunch} from "./startup.js"; -import {ipcMain, send} from "./typed-ipc-main.js"; +import {appUpdater} from "./autoupdater"; +import * as BadgeSettings from "./badge-settings"; +import * as AppMenu from "./menu"; +import {_getServerSettings, _isOnline, _saveServerIcon} from "./request"; +import {sentryInit} from "./sentry"; +import {setAutoLaunch} from "./startup"; +import {ipcMain, send} from "./typed-ipc-main"; const {GDK_BACKEND} = process.env; diff --git a/app/main/linux-update-util.ts b/app/main/linux-update-util.ts index 20c652cd..4c076618 100644 --- a/app/main/linux-update-util.ts +++ b/app/main/linux-update-util.ts @@ -5,7 +5,7 @@ import path from "path"; import {JsonDB} from "node-json-db"; import {DataError} from "node-json-db/dist/lib/Errors"; -import Logger from "../common/logger-util.js"; +import Logger from "../common/logger-util"; const logger = new Logger({ file: "linux-update-util.log", diff --git a/app/main/linuxupdater.ts b/app/main/linuxupdater.ts index 800047cd..9d885f19 100644 --- a/app/main/linuxupdater.ts +++ b/app/main/linuxupdater.ts @@ -4,11 +4,11 @@ import getStream from "get-stream"; import * as semver from "semver"; import * as z from "zod"; -import * as ConfigUtil from "../common/config-util.js"; -import Logger from "../common/logger-util.js"; +import * as ConfigUtil from "../common/config-util"; +import Logger from "../common/logger-util"; -import * as LinuxUpdateUtil from "./linux-update-util.js"; -import {fetchResponse} from "./request.js"; +import * as LinuxUpdateUtil from "./linux-update-util"; +import {fetchResponse} from "./request"; const logger = new Logger({ file: "linux-update-util.log", diff --git a/app/main/menu.ts b/app/main/menu.ts index b3f57abc..62abde63 100644 --- a/app/main/menu.ts +++ b/app/main/menu.ts @@ -2,14 +2,14 @@ import {BrowserWindow, Menu, app, shell} from "electron"; import AdmZip from "adm-zip"; -import * as ConfigUtil from "../common/config-util.js"; -import * as DNDUtil from "../common/dnd-util.js"; -import * as t from "../common/translation-util.js"; -import type {RendererMessage} from "../common/typed-ipc.js"; -import type {MenuProps, TabData} from "../common/types.js"; +import * as ConfigUtil from "../common/config-util"; +import * as DNDUtil from "../common/dnd-util"; +import * as t from "../common/translation-util"; +import type {RendererMessage} from "../common/typed-ipc"; +import type {MenuProps, TabData} from "../common/types"; -import {appUpdater} from "./autoupdater.js"; -import {send} from "./typed-ipc-main.js"; +import {appUpdater} from "./autoupdater"; +import {send} from "./typed-ipc-main"; const appName = app.name; diff --git a/app/main/request.ts b/app/main/request.ts index 8bd07326..c859e0e8 100644 --- a/app/main/request.ts +++ b/app/main/request.ts @@ -9,9 +9,9 @@ import * as Sentry from "@sentry/electron"; import getStream from "get-stream"; import * as z from "zod"; -import Logger from "../common/logger-util.js"; -import * as Messages from "../common/messages.js"; -import type {ServerConf} from "../common/types.js"; +import Logger from "../common/logger-util"; +import * as Messages from "../common/messages"; +import type {ServerConf} from "../common/types"; export async function fetchResponse( request: ClientRequest, diff --git a/app/main/sentry.ts b/app/main/sentry.ts index f7dafd2f..80b8b2b0 100644 --- a/app/main/sentry.ts +++ b/app/main/sentry.ts @@ -2,7 +2,7 @@ import {app} from "electron"; import * as Sentry from "@sentry/electron"; -import {getConfigItem} from "../common/config-util.js"; +import {getConfigItem} from "../common/config-util"; export const sentryInit = (): void => { Sentry.init({ diff --git a/app/main/startup.ts b/app/main/startup.ts index 5fb439ad..9895dfaa 100644 --- a/app/main/startup.ts +++ b/app/main/startup.ts @@ -2,7 +2,7 @@ import {app} from "electron"; import AutoLaunch from "auto-launch"; -import * as ConfigUtil from "../common/config-util.js"; +import * as ConfigUtil from "../common/config-util"; export const setAutoLaunch = async ( AutoLaunchValue: boolean, diff --git a/app/renderer/js/components/base.ts b/app/renderer/js/components/base.ts index baf066ca..1ccd84d4 100644 --- a/app/renderer/js/components/base.ts +++ b/app/renderer/js/components/base.ts @@ -1,4 +1,4 @@ -import type {Html} from "../../../common/html.js"; +import type {Html} from "../../../common/html"; export function generateNodeFromHtml(html: Html): Element { const wrapper = document.createElement("div"); diff --git a/app/renderer/js/components/context-menu.ts b/app/renderer/js/components/context-menu.ts index da158a0c..b0a7d1fe 100644 --- a/app/renderer/js/components/context-menu.ts +++ b/app/renderer/js/components/context-menu.ts @@ -2,7 +2,7 @@ import type {ContextMenuParams} from "electron"; import {Menu, clipboard} from "@electron/remote"; -import * as t from "../../../common/translation-util.js"; +import * as t from "../../../common/translation-util"; export const contextMenu = ( webContents: Electron.WebContents, diff --git a/app/renderer/js/components/functional-tab.ts b/app/renderer/js/components/functional-tab.ts index ce589228..c67964c2 100644 --- a/app/renderer/js/components/functional-tab.ts +++ b/app/renderer/js/components/functional-tab.ts @@ -1,9 +1,9 @@ -import type {Html} from "../../../common/html.js"; -import {html} from "../../../common/html.js"; +import type {Html} from "../../../common/html"; +import {html} from "../../../common/html"; -import {generateNodeFromHtml} from "./base.js"; -import type {TabProps} from "./tab.js"; -import Tab from "./tab.js"; +import {generateNodeFromHtml} from "./base"; +import type {TabProps} from "./tab"; +import Tab from "./tab"; export interface FunctionalTabProps extends TabProps { $view: Element; diff --git a/app/renderer/js/components/handle-external-link.ts b/app/renderer/js/components/handle-external-link.ts index 6cd07ac6..2add473a 100644 --- a/app/renderer/js/components/handle-external-link.ts +++ b/app/renderer/js/components/handle-external-link.ts @@ -1,10 +1,10 @@ import {app, shell} from "@electron/remote"; -import * as ConfigUtil from "../../../common/config-util.js"; -import {ipcRenderer} from "../typed-ipc-renderer.js"; -import * as LinkUtil from "../utils/link-util.js"; +import * as ConfigUtil from "../../../common/config-util"; +import {ipcRenderer} from "../typed-ipc-renderer"; +import * as LinkUtil from "../utils/link-util"; -import type WebView from "./webview.js"; +import type WebView from "./webview"; const dingSound = new Audio("../resources/sounds/ding.ogg"); diff --git a/app/renderer/js/components/server-tab.ts b/app/renderer/js/components/server-tab.ts index a556acca..5e14b38b 100644 --- a/app/renderer/js/components/server-tab.ts +++ b/app/renderer/js/components/server-tab.ts @@ -1,11 +1,11 @@ -import type {Html} from "../../../common/html.js"; -import {html} from "../../../common/html.js"; -import {ipcRenderer} from "../typed-ipc-renderer.js"; +import type {Html} from "../../../common/html"; +import {html} from "../../../common/html"; +import {ipcRenderer} from "../typed-ipc-renderer"; -import {generateNodeFromHtml} from "./base.js"; -import type {TabProps} from "./tab.js"; -import Tab from "./tab.js"; -import type WebView from "./webview.js"; +import {generateNodeFromHtml} from "./base"; +import type {TabProps} from "./tab"; +import Tab from "./tab"; +import type WebView from "./webview"; export interface ServerTabProps extends TabProps { webview: Promise; diff --git a/app/renderer/js/components/tab.ts b/app/renderer/js/components/tab.ts index 50f8ad01..c85bf665 100644 --- a/app/renderer/js/components/tab.ts +++ b/app/renderer/js/components/tab.ts @@ -1,4 +1,4 @@ -import type {TabRole} from "../../../common/types.js"; +import type {TabRole} from "../../../common/types"; export interface TabProps { role: TabRole; diff --git a/app/renderer/js/components/webview.ts b/app/renderer/js/components/webview.ts index cea5241a..40097705 100644 --- a/app/renderer/js/components/webview.ts +++ b/app/renderer/js/components/webview.ts @@ -4,17 +4,17 @@ import path from "path"; import * as remote from "@electron/remote"; import {app, dialog} from "@electron/remote"; -import * as ConfigUtil from "../../../common/config-util.js"; -import type {Html} from "../../../common/html.js"; -import {html} from "../../../common/html.js"; -import type {RendererMessage} from "../../../common/typed-ipc.js"; -import type {TabRole} from "../../../common/types.js"; -import {ipcRenderer} from "../typed-ipc-renderer.js"; -import * as SystemUtil from "../utils/system-util.js"; +import * as ConfigUtil from "../../../common/config-util"; +import type {Html} from "../../../common/html"; +import {html} from "../../../common/html"; +import type {RendererMessage} from "../../../common/typed-ipc"; +import type {TabRole} from "../../../common/types"; +import {ipcRenderer} from "../typed-ipc-renderer"; +import * as SystemUtil from "../utils/system-util"; -import {generateNodeFromHtml} from "./base.js"; -import {contextMenu} from "./context-menu.js"; -import handleExternalLink from "./handle-external-link.js"; +import {generateNodeFromHtml} from "./base"; +import {contextMenu} from "./context-menu"; +import handleExternalLink from "./handle-external-link"; const shouldSilentWebview = ConfigUtil.getConfigItem("silent", false); diff --git a/app/renderer/js/electron-bridge.ts b/app/renderer/js/electron-bridge.ts index 3b592789..c80e7d51 100644 --- a/app/renderer/js/electron-bridge.ts +++ b/app/renderer/js/electron-bridge.ts @@ -1,10 +1,10 @@ import {EventEmitter} from "events"; -import type {ClipboardDecrypter} from "./clipboard-decrypter.js"; -import {ClipboardDecrypterImpl} from "./clipboard-decrypter.js"; -import type {NotificationData} from "./notification/index.js"; -import {newNotification} from "./notification/index.js"; -import {ipcRenderer} from "./typed-ipc-renderer.js"; +import type {ClipboardDecrypter} from "./clipboard-decrypter"; +import {ClipboardDecrypterImpl} from "./clipboard-decrypter"; +import type {NotificationData} from "./notification"; +import {newNotification} from "./notification"; +import {ipcRenderer} from "./typed-ipc-renderer"; type ListenerType = (...args: any[]) => void; diff --git a/app/renderer/js/main.ts b/app/renderer/js/main.ts index ee1ff248..64fb3ea1 100644 --- a/app/renderer/js/main.ts +++ b/app/renderer/js/main.ts @@ -5,25 +5,25 @@ import {Menu, app, dialog, session} from "@electron/remote"; import * as remote from "@electron/remote"; import * as Sentry from "@sentry/electron"; -import type {Config} from "../../common/config-util.js"; -import * as ConfigUtil from "../../common/config-util.js"; -import * as DNDUtil from "../../common/dnd-util.js"; -import type {DndSettings} from "../../common/dnd-util.js"; -import * as EnterpriseUtil from "../../common/enterprise-util.js"; -import Logger from "../../common/logger-util.js"; -import * as Messages from "../../common/messages.js"; -import type {NavItem, ServerConf, TabData} from "../../common/types.js"; +import type {Config} from "../../common/config-util"; +import * as ConfigUtil from "../../common/config-util"; +import * as DNDUtil from "../../common/dnd-util"; +import type {DndSettings} from "../../common/dnd-util"; +import * as EnterpriseUtil from "../../common/enterprise-util"; +import Logger from "../../common/logger-util"; +import * as Messages from "../../common/messages"; +import type {NavItem, ServerConf, TabData} from "../../common/types"; -import FunctionalTab from "./components/functional-tab.js"; -import ServerTab from "./components/server-tab.js"; -import WebView from "./components/webview.js"; -import {AboutView} from "./pages/about.js"; -import {PreferenceView} from "./pages/preference/preference.js"; -import {initializeTray} from "./tray.js"; -import {ipcRenderer} from "./typed-ipc-renderer.js"; -import * as DomainUtil from "./utils/domain-util.js"; -import * as LinkUtil from "./utils/link-util.js"; -import ReconnectUtil from "./utils/reconnect-util.js"; +import FunctionalTab from "./components/functional-tab"; +import ServerTab from "./components/server-tab"; +import WebView from "./components/webview"; +import {AboutView} from "./pages/about"; +import {PreferenceView} from "./pages/preference/preference"; +import {initializeTray} from "./tray"; +import {ipcRenderer} from "./typed-ipc-renderer"; +import * as DomainUtil from "./utils/domain-util"; +import * as LinkUtil from "./utils/link-util"; +import ReconnectUtil from "./utils/reconnect-util"; Sentry.init({}); diff --git a/app/renderer/js/notification/index.ts b/app/renderer/js/notification/index.ts index ce1d75da..c073ebaa 100644 --- a/app/renderer/js/notification/index.ts +++ b/app/renderer/js/notification/index.ts @@ -1,4 +1,4 @@ -import {ipcRenderer} from "../typed-ipc-renderer.js"; +import {ipcRenderer} from "../typed-ipc-renderer"; export interface NotificationData { close: () => void; diff --git a/app/renderer/js/pages/about.ts b/app/renderer/js/pages/about.ts index 0ca0278e..060fe5ac 100644 --- a/app/renderer/js/pages/about.ts +++ b/app/renderer/js/pages/about.ts @@ -1,6 +1,6 @@ import {app} from "@electron/remote"; -import {html} from "../../../common/html.js"; +import {html} from "../../../common/html"; export class AboutView { readonly $view: HTMLElement; diff --git a/app/renderer/js/pages/network.ts b/app/renderer/js/pages/network.ts index 1aabab16..4a6c766e 100644 --- a/app/renderer/js/pages/network.ts +++ b/app/renderer/js/pages/network.ts @@ -1,4 +1,4 @@ -import {ipcRenderer} from "../typed-ipc-renderer.js"; +import {ipcRenderer} from "../typed-ipc-renderer"; export function init( $reconnectButton: Element, diff --git a/app/renderer/js/pages/preference/base-section.ts b/app/renderer/js/pages/preference/base-section.ts index 37717970..1522f34d 100644 --- a/app/renderer/js/pages/preference/base-section.ts +++ b/app/renderer/js/pages/preference/base-section.ts @@ -1,7 +1,7 @@ -import type {Html} from "../../../../common/html.js"; -import {html} from "../../../../common/html.js"; -import {generateNodeFromHtml} from "../../components/base.js"; -import {ipcRenderer} from "../../typed-ipc-renderer.js"; +import type {Html} from "../../../../common/html"; +import {html} from "../../../../common/html"; +import {generateNodeFromHtml} from "../../components/base"; +import {ipcRenderer} from "../../typed-ipc-renderer"; interface BaseSectionProps { $element: HTMLElement; diff --git a/app/renderer/js/pages/preference/connected-org-section.ts b/app/renderer/js/pages/preference/connected-org-section.ts index ec610928..1fe5bb2a 100644 --- a/app/renderer/js/pages/preference/connected-org-section.ts +++ b/app/renderer/js/pages/preference/connected-org-section.ts @@ -1,11 +1,11 @@ -import {html} from "../../../../common/html.js"; -import * as t from "../../../../common/translation-util.js"; -import {ipcRenderer} from "../../typed-ipc-renderer.js"; -import * as DomainUtil from "../../utils/domain-util.js"; +import {html} from "../../../../common/html"; +import * as t from "../../../../common/translation-util"; +import {ipcRenderer} from "../../typed-ipc-renderer"; +import * as DomainUtil from "../../utils/domain-util"; -import {reloadApp} from "./base-section.js"; -import {initFindAccounts} from "./find-accounts.js"; -import {initServerInfoForm} from "./server-info-form.js"; +import {reloadApp} from "./base-section"; +import {initFindAccounts} from "./find-accounts"; +import {initServerInfoForm} from "./server-info-form"; interface ConnectedOrgSectionProps { $root: Element; diff --git a/app/renderer/js/pages/preference/find-accounts.ts b/app/renderer/js/pages/preference/find-accounts.ts index 0bfa1f08..6c7c1e47 100644 --- a/app/renderer/js/pages/preference/find-accounts.ts +++ b/app/renderer/js/pages/preference/find-accounts.ts @@ -1,7 +1,7 @@ -import {html} from "../../../../common/html.js"; -import * as t from "../../../../common/translation-util.js"; -import {generateNodeFromHtml} from "../../components/base.js"; -import * as LinkUtil from "../../utils/link-util.js"; +import {html} from "../../../../common/html"; +import * as t from "../../../../common/translation-util"; +import {generateNodeFromHtml} from "../../components/base"; +import * as LinkUtil from "../../utils/link-util"; interface FindAccountsProps { $root: Element; diff --git a/app/renderer/js/pages/preference/general-section.ts b/app/renderer/js/pages/preference/general-section.ts index 4726e82e..84fd4cc2 100644 --- a/app/renderer/js/pages/preference/general-section.ts +++ b/app/renderer/js/pages/preference/general-section.ts @@ -8,14 +8,14 @@ import Tagify from "@yaireo/tagify"; import ISO6391 from "iso-639-1"; import * as z from "zod"; -import * as ConfigUtil from "../../../../common/config-util.js"; -import * as EnterpriseUtil from "../../../../common/enterprise-util.js"; -import {html} from "../../../../common/html.js"; -import * as t from "../../../../common/translation-util.js"; +import * as ConfigUtil from "../../../../common/config-util"; +import * as EnterpriseUtil from "../../../../common/enterprise-util"; +import {html} from "../../../../common/html"; +import * as t from "../../../../common/translation-util"; import supportedLocales from "../../../../translations/supported-locales.json"; -import {ipcRenderer} from "../../typed-ipc-renderer.js"; +import {ipcRenderer} from "../../typed-ipc-renderer"; -import {generateSelectHtml, generateSettingOption} from "./base-section.js"; +import {generateSelectHtml, generateSettingOption} from "./base-section"; const currentBrowserWindow = remote.getCurrentWindow(); diff --git a/app/renderer/js/pages/preference/nav.ts b/app/renderer/js/pages/preference/nav.ts index ac9711b4..313dcf62 100644 --- a/app/renderer/js/pages/preference/nav.ts +++ b/app/renderer/js/pages/preference/nav.ts @@ -1,8 +1,8 @@ -import type {Html} from "../../../../common/html.js"; -import {html} from "../../../../common/html.js"; -import * as t from "../../../../common/translation-util.js"; -import type {NavItem} from "../../../../common/types.js"; -import {generateNodeFromHtml} from "../../components/base.js"; +import type {Html} from "../../../../common/html"; +import {html} from "../../../../common/html"; +import * as t from "../../../../common/translation-util"; +import type {NavItem} from "../../../../common/types"; +import {generateNodeFromHtml} from "../../components/base"; interface PreferenceNavProps { $root: Element; diff --git a/app/renderer/js/pages/preference/network-section.ts b/app/renderer/js/pages/preference/network-section.ts index 7735c7b5..4d43f839 100644 --- a/app/renderer/js/pages/preference/network-section.ts +++ b/app/renderer/js/pages/preference/network-section.ts @@ -1,9 +1,9 @@ -import * as ConfigUtil from "../../../../common/config-util.js"; -import {html} from "../../../../common/html.js"; -import * as t from "../../../../common/translation-util.js"; -import {ipcRenderer} from "../../typed-ipc-renderer.js"; +import * as ConfigUtil from "../../../../common/config-util"; +import {html} from "../../../../common/html"; +import * as t from "../../../../common/translation-util"; +import {ipcRenderer} from "../../typed-ipc-renderer"; -import {generateSettingOption} from "./base-section.js"; +import {generateSettingOption} from "./base-section"; interface NetworkSectionProps { $root: Element; diff --git a/app/renderer/js/pages/preference/new-server-form.ts b/app/renderer/js/pages/preference/new-server-form.ts index b97e116b..c21d8d0b 100644 --- a/app/renderer/js/pages/preference/new-server-form.ts +++ b/app/renderer/js/pages/preference/new-server-form.ts @@ -1,11 +1,11 @@ import {dialog} from "@electron/remote"; -import {html} from "../../../../common/html.js"; -import * as t from "../../../../common/translation-util.js"; -import {generateNodeFromHtml} from "../../components/base.js"; -import {ipcRenderer} from "../../typed-ipc-renderer.js"; -import * as DomainUtil from "../../utils/domain-util.js"; -import * as LinkUtil from "../../utils/link-util.js"; +import {html} from "../../../../common/html"; +import * as t from "../../../../common/translation-util"; +import {generateNodeFromHtml} from "../../components/base"; +import {ipcRenderer} from "../../typed-ipc-renderer"; +import * as DomainUtil from "../../utils/domain-util"; +import * as LinkUtil from "../../utils/link-util"; interface NewServerFormProps { $root: Element; diff --git a/app/renderer/js/pages/preference/preference.ts b/app/renderer/js/pages/preference/preference.ts index 7bd16504..4094a468 100644 --- a/app/renderer/js/pages/preference/preference.ts +++ b/app/renderer/js/pages/preference/preference.ts @@ -1,14 +1,14 @@ -import type {DndSettings} from "../../../../common/dnd-util.js"; -import {html} from "../../../../common/html.js"; -import type {NavItem} from "../../../../common/types.js"; -import {ipcRenderer} from "../../typed-ipc-renderer.js"; +import type {DndSettings} from "../../../../common/dnd-util"; +import {html} from "../../../../common/html"; +import type {NavItem} from "../../../../common/types"; +import {ipcRenderer} from "../../typed-ipc-renderer"; -import {initConnectedOrgSection} from "./connected-org-section.js"; -import {initGeneralSection} from "./general-section.js"; -import Nav from "./nav.js"; -import {initNetworkSection} from "./network-section.js"; -import {initServersSection} from "./servers-section.js"; -import {initShortcutsSection} from "./shortcuts-section.js"; +import {initConnectedOrgSection} from "./connected-org-section"; +import {initGeneralSection} from "./general-section"; +import Nav from "./nav"; +import {initNetworkSection} from "./network-section"; +import {initServersSection} from "./servers-section"; +import {initShortcutsSection} from "./shortcuts-section"; export class PreferenceView { readonly $view: HTMLElement; diff --git a/app/renderer/js/pages/preference/server-info-form.ts b/app/renderer/js/pages/preference/server-info-form.ts index b8261c89..7f4e71b8 100644 --- a/app/renderer/js/pages/preference/server-info-form.ts +++ b/app/renderer/js/pages/preference/server-info-form.ts @@ -1,12 +1,12 @@ import {dialog} from "@electron/remote"; -import {html} from "../../../../common/html.js"; -import * as Messages from "../../../../common/messages.js"; -import * as t from "../../../../common/translation-util.js"; -import type {ServerConf} from "../../../../common/types.js"; -import {generateNodeFromHtml} from "../../components/base.js"; -import {ipcRenderer} from "../../typed-ipc-renderer.js"; -import * as DomainUtil from "../../utils/domain-util.js"; +import {html} from "../../../../common/html"; +import * as Messages from "../../../../common/messages"; +import * as t from "../../../../common/translation-util"; +import type {ServerConf} from "../../../../common/types"; +import {generateNodeFromHtml} from "../../components/base"; +import {ipcRenderer} from "../../typed-ipc-renderer"; +import * as DomainUtil from "../../utils/domain-util"; interface ServerInfoFormProps { $root: Element; diff --git a/app/renderer/js/pages/preference/servers-section.ts b/app/renderer/js/pages/preference/servers-section.ts index 9a8ab7e2..2b2823a2 100644 --- a/app/renderer/js/pages/preference/servers-section.ts +++ b/app/renderer/js/pages/preference/servers-section.ts @@ -1,8 +1,8 @@ -import {html} from "../../../../common/html.js"; -import * as t from "../../../../common/translation-util.js"; +import {html} from "../../../../common/html"; +import * as t from "../../../../common/translation-util"; -import {reloadApp} from "./base-section.js"; -import {initNewServerForm} from "./new-server-form.js"; +import {reloadApp} from "./base-section"; +import {initNewServerForm} from "./new-server-form"; interface ServersSectionProps { $root: Element; diff --git a/app/renderer/js/pages/preference/shortcuts-section.ts b/app/renderer/js/pages/preference/shortcuts-section.ts index 1c0f4fce..8c2db4d5 100644 --- a/app/renderer/js/pages/preference/shortcuts-section.ts +++ b/app/renderer/js/pages/preference/shortcuts-section.ts @@ -1,6 +1,6 @@ -import {html} from "../../../../common/html.js"; -import * as t from "../../../../common/translation-util.js"; -import * as LinkUtil from "../../utils/link-util.js"; +import {html} from "../../../../common/html"; +import * as t from "../../../../common/translation-util"; +import * as LinkUtil from "../../utils/link-util"; interface ShortcutsSectionProps { $root: Element; diff --git a/app/renderer/js/preload.ts b/app/renderer/js/preload.ts index 3c1a664f..f52e3e0a 100644 --- a/app/renderer/js/preload.ts +++ b/app/renderer/js/preload.ts @@ -1,9 +1,9 @@ import {contextBridge, webFrame} from "electron"; import fs from "fs"; -import electron_bridge, {bridgeEvents} from "./electron-bridge.js"; -import * as NetworkError from "./pages/network.js"; -import {ipcRenderer} from "./typed-ipc-renderer.js"; +import electron_bridge, {bridgeEvents} from "./electron-bridge"; +import * as NetworkError from "./pages/network"; +import {ipcRenderer} from "./typed-ipc-renderer"; contextBridge.exposeInMainWorld("raw_electron_bridge", electron_bridge); diff --git a/app/renderer/js/tray.ts b/app/renderer/js/tray.ts index e886d101..11cd8efa 100644 --- a/app/renderer/js/tray.ts +++ b/app/renderer/js/tray.ts @@ -3,11 +3,11 @@ import path from "path"; import {BrowserWindow, Menu, Tray, nativeImage} from "@electron/remote"; -import * as ConfigUtil from "../../common/config-util.js"; -import type {RendererMessage} from "../../common/typed-ipc.js"; +import * as ConfigUtil from "../../common/config-util"; +import type {RendererMessage} from "../../common/typed-ipc"; -import type {ServerManagerView} from "./main.js"; -import {ipcRenderer} from "./typed-ipc-renderer.js"; +import type {ServerManagerView} from "./main"; +import {ipcRenderer} from "./typed-ipc-renderer"; let tray: Electron.Tray | null = null; diff --git a/app/renderer/js/utils/domain-util.ts b/app/renderer/js/utils/domain-util.ts index 85983bd4..f8f4694c 100644 --- a/app/renderer/js/utils/domain-util.ts +++ b/app/renderer/js/utils/domain-util.ts @@ -7,11 +7,11 @@ import {JsonDB} from "node-json-db"; import {DataError} from "node-json-db/dist/lib/Errors"; import * as z from "zod"; -import * as EnterpriseUtil from "../../../common/enterprise-util.js"; -import Logger from "../../../common/logger-util.js"; -import * as Messages from "../../../common/messages.js"; -import type {ServerConf} from "../../../common/types.js"; -import {ipcRenderer} from "../typed-ipc-renderer.js"; +import * as EnterpriseUtil from "../../../common/enterprise-util"; +import Logger from "../../../common/logger-util"; +import * as Messages from "../../../common/messages"; +import type {ServerConf} from "../../../common/types"; +import {ipcRenderer} from "../typed-ipc-renderer"; const logger = new Logger({ file: "domain-util.log", diff --git a/app/renderer/js/utils/link-util.ts b/app/renderer/js/utils/link-util.ts index 608aaaea..8ce88a8d 100644 --- a/app/renderer/js/utils/link-util.ts +++ b/app/renderer/js/utils/link-util.ts @@ -3,7 +3,7 @@ import fs from "fs"; import os from "os"; import path from "path"; -import {html} from "../../../common/html.js"; +import {html} from "../../../common/html"; export function isUploadsUrl(server: string, url: URL): boolean { return url.origin === server && url.pathname.startsWith("/user_uploads/"); diff --git a/app/renderer/js/utils/reconnect-util.ts b/app/renderer/js/utils/reconnect-util.ts index 5d2baa79..a4ccd611 100644 --- a/app/renderer/js/utils/reconnect-util.ts +++ b/app/renderer/js/utils/reconnect-util.ts @@ -1,9 +1,9 @@ import * as backoff from "backoff"; -import {html} from "../../../common/html.js"; -import Logger from "../../../common/logger-util.js"; -import type WebView from "../components/webview.js"; -import {ipcRenderer} from "../typed-ipc-renderer.js"; +import {html} from "../../../common/html"; +import Logger from "../../../common/logger-util"; +import type WebView from "../components/webview"; +import {ipcRenderer} from "../typed-ipc-renderer"; const logger = new Logger({ file: "domain-util.log", diff --git a/app/renderer/js/utils/system-util.ts b/app/renderer/js/utils/system-util.ts index 63af7d05..ecab6448 100644 --- a/app/renderer/js/utils/system-util.ts +++ b/app/renderer/js/utils/system-util.ts @@ -1,4 +1,4 @@ -import {ipcRenderer} from "../typed-ipc-renderer.js"; +import {ipcRenderer} from "../typed-ipc-renderer"; export const connectivityError: string[] = [ "ERR_INTERNET_DISCONNECTED",