diff --git a/pages/_app.tsx b/pages/_app.tsx index 110501095..678e5bb5f 100644 --- a/pages/_app.tsx +++ b/pages/_app.tsx @@ -6,9 +6,9 @@ import { CacheProvider, EmotionCache } from '@emotion/react'; import { CssBaseline, CssVarsProvider } from '@mui/joy'; import { QueryClient, QueryClientProvider } from '@tanstack/react-query'; -import '@/common/styles/GithubMarkdown.css'; -import { Brand } from '@/common/brand'; -import { createEmotionCache, theme } from '@/common/theme'; +import '~/common/styles/GithubMarkdown.css'; +import { Brand } from '~/common/brand'; +import { createEmotionCache, theme } from '~/common/theme'; // Client-side cache, shared for the whole session of the user in the browser. diff --git a/pages/_document.tsx b/pages/_document.tsx index d82b54658..18b4ad737 100644 --- a/pages/_document.tsx +++ b/pages/_document.tsx @@ -4,9 +4,10 @@ import { default as Document, DocumentContext, DocumentProps, Head, Html, Main, import createEmotionServer from '@emotion/server/create-instance'; import { getInitColorSchemeScript } from '@mui/joy/styles'; -import { Brand } from '@/common/brand'; +import { Brand } from '~/common/brand'; +import { bodyFontClassName, createEmotionCache } from '~/common/theme'; + import { MyAppProps } from './_app'; -import { bodyFontClassName, createEmotionCache } from '@/common/theme'; interface MyDocumentProps extends DocumentProps { diff --git a/pages/api/elevenlabs/speech.ts b/pages/api/elevenlabs/speech.ts index 42604d4c6..5812089c9 100644 --- a/pages/api/elevenlabs/speech.ts +++ b/pages/api/elevenlabs/speech.ts @@ -1,7 +1,7 @@ import { NextRequest, NextResponse } from 'next/server'; -import { ElevenLabs } from '@/modules/elevenlabs/elevenlabs.types'; -import { postToElevenLabs } from '@/modules/elevenlabs/elevenlabs.server'; +import { ElevenLabs } from '~/modules/elevenlabs/elevenlabs.types'; +import { postToElevenLabs } from '~/modules/elevenlabs/elevenlabs.server'; export default async function handler(req: NextRequest) { diff --git a/pages/api/elevenlabs/voices.ts b/pages/api/elevenlabs/voices.ts index ecd0ebf0a..47a5bd8a3 100644 --- a/pages/api/elevenlabs/voices.ts +++ b/pages/api/elevenlabs/voices.ts @@ -1,7 +1,7 @@ import { NextRequest, NextResponse } from 'next/server'; -import { ElevenLabs } from '@/modules/elevenlabs/elevenlabs.types'; -import { getFromElevenLabs } from '@/modules/elevenlabs/elevenlabs.server'; +import { ElevenLabs } from '~/modules/elevenlabs/elevenlabs.types'; +import { getFromElevenLabs } from '~/modules/elevenlabs/elevenlabs.server'; export default async function handler(req: NextRequest) { diff --git a/pages/api/openai/chat.ts b/pages/api/openai/chat.ts index 806e06614..ab77006b0 100644 --- a/pages/api/openai/chat.ts +++ b/pages/api/openai/chat.ts @@ -1,7 +1,7 @@ import { NextRequest, NextResponse } from 'next/server'; -import { OpenAI } from '@/modules/openai/openai.types'; -import { openaiPost, toApiChatRequest, toWireCompletionRequest } from '@/modules/openai/openai.server'; +import { OpenAI } from '~/modules/openai/openai.types'; +import { openaiPost, toApiChatRequest, toWireCompletionRequest } from '~/modules/openai/openai.server'; diff --git a/pages/api/openai/models.ts b/pages/api/openai/models.ts index cfeccc652..2396f4050 100644 --- a/pages/api/openai/models.ts +++ b/pages/api/openai/models.ts @@ -1,7 +1,7 @@ import { NextRequest, NextResponse } from 'next/server'; -import { OpenAI } from '@/modules/openai/openai.types'; -import { openaiGet, toApiChatRequest } from '@/modules/openai/openai.server'; +import { OpenAI } from '~/modules/openai/openai.types'; +import { openaiGet, toApiChatRequest } from '~/modules/openai/openai.server'; export default async function handler(req: NextRequest): Promise { diff --git a/pages/api/openai/stream-chat.ts b/pages/api/openai/stream-chat.ts index 7a4310f5a..763b107b5 100644 --- a/pages/api/openai/stream-chat.ts +++ b/pages/api/openai/stream-chat.ts @@ -1,8 +1,8 @@ import { NextRequest, NextResponse } from 'next/server'; import { createParser } from 'eventsource-parser'; -import { OpenAI } from '@/modules/openai/openai.types'; -import { openaiPostResponse, toApiChatRequest, toWireCompletionRequest } from '@/modules/openai/openai.server'; +import { OpenAI } from '~/modules/openai/openai.types'; +import { openaiPostResponse, toApiChatRequest, toWireCompletionRequest } from '~/modules/openai/openai.server'; async function chatStreamRepeater(api: OpenAI.API.Configuration, rest: Omit, signal: AbortSignal): Promise { diff --git a/pages/api/prodia/imagine.ts b/pages/api/prodia/imagine.ts index e5cb990a7..bd1d3aa1b 100644 --- a/pages/api/prodia/imagine.ts +++ b/pages/api/prodia/imagine.ts @@ -2,7 +2,7 @@ import { NextRequest, NextResponse } from 'next/server'; -import { Prodia } from '@/modules/prodia/prodia.types'; +import { Prodia } from '~/modules/prodia/prodia.types'; export const prodiaHeaders = (apiKey: string): Record => ({ diff --git a/pages/api/prodia/models.ts b/pages/api/prodia/models.ts index 5a98fd8c8..3a59e9470 100644 --- a/pages/api/prodia/models.ts +++ b/pages/api/prodia/models.ts @@ -1,6 +1,6 @@ import { NextRequest, NextResponse } from 'next/server'; -import { Prodia } from '@/modules/prodia/prodia.types'; +import { Prodia } from '~/modules/prodia/prodia.types'; // for lack of an API diff --git a/pages/api/publish.ts b/pages/api/publish.ts index 5d3ade387..2ef0a0e43 100644 --- a/pages/api/publish.ts +++ b/pages/api/publish.ts @@ -2,8 +2,8 @@ import { NextRequest, NextResponse } from 'next/server'; -import { PasteGG } from '@/modules/pastegg/pastegg.types'; -import { pasteGgPost } from '@/modules/pastegg/pastegg.server'; +import { PasteGG } from '~/modules/pastegg/pastegg.types'; +import { pasteGgPost } from '~/modules/pastegg/pastegg.server'; /** diff --git a/pages/api/search/google.ts b/pages/api/search/google.ts index fe90ae2f2..55a4e9b5e 100644 --- a/pages/api/search/google.ts +++ b/pages/api/search/google.ts @@ -1,7 +1,7 @@ import { NextRequest, NextResponse } from 'next/server'; -import { Search } from '@/modules/search/search.types'; -import { objectToQueryString } from '@/modules/search/search.client'; +import { Search } from '~/modules/search/search.types'; +import { objectToQueryString } from '~/modules/search/search.client'; export default async function handler(req: NextRequest): Promise { diff --git a/pages/index.tsx b/pages/index.tsx index 5f060c89e..68cb3deb0 100644 --- a/pages/index.tsx +++ b/pages/index.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; -import { AppLayout } from '@/common/layouts/AppLayout'; +import { AppLayout } from '~/common/layouts/AppLayout'; import { Chat } from '../src/apps/chat/Chat'; diff --git a/src/apps/chat/Chat.tsx b/src/apps/chat/Chat.tsx index bdfce0c50..1d5f0883e 100644 --- a/src/apps/chat/Chat.tsx +++ b/src/apps/chat/Chat.tsx @@ -3,20 +3,20 @@ import { shallow } from 'zustand/shallow'; import { useTheme } from '@mui/joy'; -import { CmdRunProdia } from '@/modules/prodia/prodia.client'; -import { CmdRunReact } from '@/modules/search/search.client'; -import { PasteGG } from '@/modules/pastegg/pastegg.types'; -import { PublishedModal } from '@/modules/pastegg/PublishedModal'; -import { callPublish } from '@/modules/pastegg/pastegg.client'; +import { CmdRunProdia } from '~/modules/prodia/prodia.client'; +import { CmdRunReact } from '~/modules/search/search.client'; +import { PasteGG } from '~/modules/pastegg/pastegg.types'; +import { PublishedModal } from '~/modules/pastegg/PublishedModal'; +import { callPublish } from '~/modules/pastegg/pastegg.client'; -import { ConfirmationModal } from '@/common/components/ConfirmationModal'; -import { Link } from '@/common/components/Link'; -import { conversationToMarkdown } from '@/common/util/conversationToMarkdown'; -import { createDMessage, DMessage, restoreConversationFromJson, useChatStore } from '@/common/state/store-chats'; -import { extractCommands } from '@/common/util/extractCommands'; -import { useApplicationBarStore } from '@/common/layouts/appbar/useApplicationBarStore'; -import { useComposerStore } from '@/common/state/store-composer'; -import { useSettingsStore } from '@/common/state/store-settings'; +import { ConfirmationModal } from '~/common/components/ConfirmationModal'; +import { Link } from '~/common/components/Link'; +import { conversationToMarkdown } from '~/common/util/conversationToMarkdown'; +import { createDMessage, DMessage, restoreConversationFromJson, useChatStore } from '~/common/state/store-chats'; +import { extractCommands } from '~/common/util/extractCommands'; +import { useApplicationBarStore } from '~/common/layouts/appbar/useApplicationBarStore'; +import { useComposerStore } from '~/common/state/store-composer'; +import { useSettingsStore } from '~/common/state/store-settings'; import { ActionItems } from './components/appbar/ActionItems'; import { ChatMessageList } from './components/ChatMessageList'; diff --git a/src/apps/chat/components/ChatMessageList.tsx b/src/apps/chat/components/ChatMessageList.tsx index 256845978..4b4f34495 100644 --- a/src/apps/chat/components/ChatMessageList.tsx +++ b/src/apps/chat/components/ChatMessageList.tsx @@ -4,8 +4,8 @@ import { shallow } from 'zustand/shallow'; import { Box, List } from '@mui/joy'; import { SxProps } from '@mui/joy/styles/types'; -import { createDMessage, DMessage, useChatStore } from '@/common/state/store-chats'; -import { useSettingsStore } from '@/common/state/store-settings'; +import { createDMessage, DMessage, useChatStore } from '~/common/state/store-chats'; +import { useSettingsStore } from '~/common/state/store-settings'; import { ChatMessage } from './message/ChatMessage'; import { ChatMessageSelectable, MessagesSelectionHeader } from './message/ChatMessageSelectable'; diff --git a/src/apps/chat/components/PurposeSelector.tsx b/src/apps/chat/components/PurposeSelector.tsx index f82e63546..8f2c3ac59 100644 --- a/src/apps/chat/components/PurposeSelector.tsx +++ b/src/apps/chat/components/PurposeSelector.tsx @@ -6,9 +6,9 @@ import ClearIcon from '@mui/icons-material/Clear'; import SearchIcon from '@mui/icons-material/Search'; import { SystemPurposeId, SystemPurposes } from '../../../data'; -import { useChatStore } from '@/common/state/store-chats'; -import { usePurposeStore } from '@/common/state/store-purposes'; -import { useSettingsStore } from '@/common/state/store-settings'; +import { useChatStore } from '~/common/state/store-chats'; +import { usePurposeStore } from '~/common/state/store-purposes'; +import { useSettingsStore } from '~/common/state/store-settings'; // Constants for tile sizes / grid width - breakpoints need to be computed here to work around diff --git a/src/apps/chat/components/appbar/ActionItems.tsx b/src/apps/chat/components/appbar/ActionItems.tsx index 662250f97..563a7e367 100644 --- a/src/apps/chat/components/appbar/ActionItems.tsx +++ b/src/apps/chat/components/appbar/ActionItems.tsx @@ -9,8 +9,8 @@ import ExitToAppIcon from '@mui/icons-material/ExitToApp'; import FileDownloadIcon from '@mui/icons-material/FileDownload'; import SettingsSuggestIcon from '@mui/icons-material/SettingsSuggest'; -import { downloadConversationJson, useChatStore } from '@/common/state/store-chats'; -import { useSettingsStore } from '@/common/state/store-settings'; +import { downloadConversationJson, useChatStore } from '~/common/state/store-chats'; +import { useSettingsStore } from '~/common/state/store-settings'; export function ActionItems(props: { diff --git a/src/apps/chat/components/appbar/ConversationItem.tsx b/src/apps/chat/components/appbar/ConversationItem.tsx index d465f6c29..bafc0b3a1 100644 --- a/src/apps/chat/components/appbar/ConversationItem.tsx +++ b/src/apps/chat/components/appbar/ConversationItem.tsx @@ -6,9 +6,9 @@ import { SxProps } from '@mui/joy/styles/types'; import CloseIcon from '@mui/icons-material/Close'; import DeleteOutlineIcon from '@mui/icons-material/DeleteOutline'; -import { InlineTextarea } from '@/common/components/InlineTextarea'; +import { InlineTextarea } from '~/common/components/InlineTextarea'; import { SystemPurposes } from '../../../../data'; -import { conversationTitle, useChatStore } from '@/common/state/store-chats'; +import { conversationTitle, useChatStore } from '~/common/state/store-chats'; const DEBUG_CONVERSATION_IDs = false; diff --git a/src/apps/chat/components/appbar/ConversationItems.tsx b/src/apps/chat/components/appbar/ConversationItems.tsx index aa5f5f912..0e6011bfd 100644 --- a/src/apps/chat/components/appbar/ConversationItems.tsx +++ b/src/apps/chat/components/appbar/ConversationItems.tsx @@ -6,8 +6,8 @@ import AddIcon from '@mui/icons-material/Add'; import DeleteOutlineIcon from '@mui/icons-material/DeleteOutline'; import FileUploadIcon from '@mui/icons-material/FileUpload'; -import { MAX_CONVERSATIONS, useChatStore } from '@/common/state/store-chats'; -import { useSettingsStore } from '@/common/state/store-settings'; +import { MAX_CONVERSATIONS, useChatStore } from '~/common/state/store-chats'; +import { useSettingsStore } from '~/common/state/store-settings'; import { ConversationItem } from './ConversationItem'; diff --git a/src/apps/chat/components/appbar/Dropdowns.tsx b/src/apps/chat/components/appbar/Dropdowns.tsx index 5a354522b..a27cc8d77 100644 --- a/src/apps/chat/components/appbar/Dropdowns.tsx +++ b/src/apps/chat/components/appbar/Dropdowns.tsx @@ -1,9 +1,9 @@ import * as React from 'react'; import { shallow } from 'zustand/shallow'; -import { AppBarDropdown } from '@/common/layouts/appbar/AppBarDropdown'; -import { useChatStore } from '@/common/state/store-chats'; -import { useSettingsStore } from '@/common/state/store-settings'; +import { AppBarDropdown } from '~/common/layouts/appbar/AppBarDropdown'; +import { useChatStore } from '~/common/state/store-chats'; +import { useSettingsStore } from '~/common/state/store-settings'; import { ChatModelId, ChatModels, SystemPurposeId, SystemPurposes } from '../../../../data'; diff --git a/src/apps/chat/components/composer/Composer.tsx b/src/apps/chat/components/composer/Composer.tsx index b98eb3106..4a5f7ddf5 100644 --- a/src/apps/chat/components/composer/Composer.tsx +++ b/src/apps/chat/components/composer/Composer.tsx @@ -17,20 +17,19 @@ import TelegramIcon from '@mui/icons-material/Telegram'; import UploadFileIcon from '@mui/icons-material/UploadFile'; import { ChatModels, SendModeId, SendModes } from '../../../../data'; -import { ConfirmationModal } from '@/common/components/ConfirmationModal'; -import { countModelTokens } from '@/common/llm-util/token-counter'; -import { htmlTableToMarkdown } from '@/common/util/htmlTableToMarkdown'; -import { pdfToText } from '@/common/util/pdfToText'; -import { useChatStore } from '@/common/state/store-chats'; -import { useComposerStore } from '@/common/state/store-composer'; -import { useSettingsStore } from '@/common/state/store-settings'; -import { useSpeechRecognition } from '@/common/components/useSpeechRecognition'; +import { ConfirmationModal } from '~/common/components/ConfirmationModal'; +import { countModelTokens } from '~/common/llm-util/token-counter'; +import { hideOnDesktop, hideOnMobile } from '~/common/theme'; +import { htmlTableToMarkdown } from '~/common/util/htmlTableToMarkdown'; +import { pdfToText } from '~/common/util/pdfToText'; +import { useChatStore } from '~/common/state/store-chats'; +import { useComposerStore } from '~/common/state/store-composer'; +import { useSettingsStore } from '~/common/state/store-settings'; +import { useSpeechRecognition } from '~/common/components/useSpeechRecognition'; import { ContentReducerModal } from './ContentReducerModal'; import { TokenBadge } from './TokenBadge'; import { TokenProgressbar } from './TokenProgressbar'; -import { hideOnDesktop, hideOnMobile } from '@/common/theme'; -// import { isValidProdiaApiKey, requireUserKeyProdia } from '@/modules/prodia/prodia.client'; /// Text template helpers diff --git a/src/apps/chat/components/composer/ContentReducerModal.tsx b/src/apps/chat/components/composer/ContentReducerModal.tsx index 3d1662bf1..9eaa1b34e 100644 --- a/src/apps/chat/components/composer/ContentReducerModal.tsx +++ b/src/apps/chat/components/composer/ContentReducerModal.tsx @@ -3,9 +3,9 @@ import * as React from 'react'; import { Alert, Box, Button, CircularProgress, Divider, FormControl, FormHelperText, FormLabel, Modal, ModalClose, ModalDialog, Option, Select, Slider, Stack, Textarea, Typography } from '@mui/joy'; import { ChatModelId, ChatModels, fastChatModelId } from '../../../../data'; -import { Section } from '@/common/components/Section'; -import { countModelTokens } from '@/common/llm-util/token-counter'; -import { summerizeToFitContextBudget } from '@/common/llm-util/summerize'; +import { Section } from '~/common/components/Section'; +import { countModelTokens } from '~/common/llm-util/token-counter'; +import { summerizeToFitContextBudget } from '~/common/llm-util/summerize'; import { TokenBadge } from './TokenBadge'; diff --git a/src/apps/chat/components/ephemerals/Ephemerals.tsx b/src/apps/chat/components/ephemerals/Ephemerals.tsx index 3d29fba9e..4b392388d 100644 --- a/src/apps/chat/components/ephemerals/Ephemerals.tsx +++ b/src/apps/chat/components/ephemerals/Ephemerals.tsx @@ -5,7 +5,7 @@ import { Box, Grid, IconButton, Sheet, Stack, styled, Typography, useTheme } fro import { SxProps } from '@mui/joy/styles/types'; import CloseIcon from '@mui/icons-material/Close'; -import { DEphemeral, useChatStore } from '@/common/state/store-chats'; +import { DEphemeral, useChatStore } from '~/common/state/store-chats'; const StateLine = styled(Typography)(({ theme }) => ({ @@ -42,7 +42,7 @@ function ListRenderer({ name, list }: { name: string, list: any[] }) { return {name}[{list.length ? list.length : ''}]: {list.length ? '(not displayed)' : 'empty'}; } -function ObjectRenderer({ name, value }: { name: string, value: object }) { +function ObjectRenderer({ name }: { name: string }) { return {name}: object not displayed; } @@ -66,7 +66,7 @@ function StateRenderer(props: { state: object }) { : Array.isArray(value) ? : typeof value === 'object' - ? + ? : {key}: {value}, )} diff --git a/src/apps/chat/components/message/ChatMessage.tsx b/src/apps/chat/components/message/ChatMessage.tsx index 60a1cc5e7..4f8491543 100644 --- a/src/apps/chat/components/message/ChatMessage.tsx +++ b/src/apps/chat/components/message/ChatMessage.tsx @@ -15,17 +15,17 @@ import ReplayIcon from '@mui/icons-material/Replay'; import SettingsSuggestIcon from '@mui/icons-material/SettingsSuggest'; import SmartToyOutlinedIcon from '@mui/icons-material/SmartToyOutlined'; -import { requireUserKeyElevenLabs, speakText } from '@/modules/elevenlabs/elevenlabs.client'; -import { requireUserKeyProdia } from '@/modules/prodia/prodia.client'; +import { requireUserKeyElevenLabs, speakText } from '~/modules/elevenlabs/elevenlabs.client'; +import { requireUserKeyProdia } from '~/modules/prodia/prodia.client'; -import { DMessage } from '@/common/state/store-chats'; -import { InlineTextarea } from '@/common/components/InlineTextarea'; -import { Link } from '@/common/components/Link'; +import { DMessage } from '~/common/state/store-chats'; +import { InlineTextarea } from '~/common/components/InlineTextarea'; +import { Link } from '~/common/components/Link'; import { SystemPurposeId, SystemPurposes } from '../../../../data'; -import { copyToClipboard } from '@/common/util/copyToClipboard'; -import { cssRainbowColorKeyframes } from '@/common/theme'; -import { prettyBaseModel } from '@/common/util/conversationToMarkdown'; -import { useSettingsStore } from '@/common/state/store-settings'; +import { copyToClipboard } from '~/common/util/copyToClipboard'; +import { cssRainbowColorKeyframes } from '~/common/theme'; +import { prettyBaseModel } from '~/common/util/conversationToMarkdown'; +import { useSettingsStore } from '~/common/state/store-settings'; import { RenderCode } from './RenderCode'; import { RenderHtml } from './RenderHtml'; diff --git a/src/apps/chat/components/message/ChatMessageSelectable.tsx b/src/apps/chat/components/message/ChatMessageSelectable.tsx index 9a1f9ffe0..11acecac2 100644 --- a/src/apps/chat/components/message/ChatMessageSelectable.tsx +++ b/src/apps/chat/components/message/ChatMessageSelectable.tsx @@ -4,7 +4,7 @@ import { Box, Button, Checkbox, IconButton, ListItem, Sheet, Typography, useThem import ClearIcon from '@mui/icons-material/Clear'; import DeleteOutlineIcon from '@mui/icons-material/DeleteOutline'; -import { DMessage } from '@/common/state/store-chats'; +import { DMessage } from '~/common/state/store-chats'; import { TokenBadge } from '../composer/TokenBadge'; import { makeAvatar, messageBackground } from './ChatMessage'; diff --git a/src/apps/chat/components/message/RenderCode.tsx b/src/apps/chat/components/message/RenderCode.tsx index b9129ddfa..232d5f74d 100644 --- a/src/apps/chat/components/message/RenderCode.tsx +++ b/src/apps/chat/components/message/RenderCode.tsx @@ -9,7 +9,7 @@ import ContentCopyIcon from '@mui/icons-material/ContentCopy'; import SchemaIcon from '@mui/icons-material/Schema'; import ShapeLineOutlinedIcon from '@mui/icons-material/ShapeLineOutlined'; -import { copyToClipboard } from '@/common/util/copyToClipboard'; +import { copyToClipboard } from '~/common/util/copyToClipboard'; import { CodeBlock } from './Block'; import { OpenInCodepen } from './OpenInCodepen'; diff --git a/src/apps/chat/components/message/RenderImage.tsx b/src/apps/chat/components/message/RenderImage.tsx index 352cb10b0..16ed084b3 100644 --- a/src/apps/chat/components/message/RenderImage.tsx +++ b/src/apps/chat/components/message/RenderImage.tsx @@ -4,7 +4,7 @@ import { Box, IconButton, Tooltip } from '@mui/joy'; import ReplayIcon from '@mui/icons-material/Replay'; import ZoomOutMapIcon from '@mui/icons-material/ZoomOutMap'; -import { Link } from '@/common/components/Link'; +import { Link } from '~/common/components/Link'; import { ImageBlock } from './Block'; diff --git a/src/apps/chat/components/message/RenderText.tsx b/src/apps/chat/components/message/RenderText.tsx index 485b9dd38..5978ffe30 100644 --- a/src/apps/chat/components/message/RenderText.tsx +++ b/src/apps/chat/components/message/RenderText.tsx @@ -3,7 +3,7 @@ import * as React from 'react'; import { Chip, Typography } from '@mui/joy'; import { SxProps } from '@mui/joy/styles/types'; -import { extractCommands } from '@/common/util/extractCommands'; +import { extractCommands } from '~/common/util/extractCommands'; import { TextBlock } from './Block'; diff --git a/src/apps/chat/util/agi-immediate.ts b/src/apps/chat/util/agi-immediate.ts index f2508ab76..c75ee9bf1 100644 --- a/src/apps/chat/util/agi-immediate.ts +++ b/src/apps/chat/util/agi-immediate.ts @@ -1,10 +1,11 @@ import { ChatModelId, SystemPurposeId, SystemPurposes } from '../../../data'; -import { createDMessage, DMessage, useChatStore } from '@/common/state/store-chats'; -import { OpenAI } from '@/modules/openai/openai.types'; -import { getOpenAISettings } from '@/modules/openai/openai.client'; -import { speakText } from '@/modules/elevenlabs/elevenlabs.client'; -import { useSettingsStore } from '@/common/state/store-settings'; +import { OpenAI } from '~/modules/openai/openai.types'; +import { getOpenAISettings } from '~/modules/openai/openai.client'; +import { speakText } from '~/modules/elevenlabs/elevenlabs.client'; + +import { createDMessage, DMessage, useChatStore } from '~/common/state/store-chats'; +import { useSettingsStore } from '~/common/state/store-settings'; import { updateAutoConversationTitle } from './ai-functions'; diff --git a/src/apps/chat/util/agi-react.ts b/src/apps/chat/util/agi-react.ts index e7a6bb850..ddee287a6 100644 --- a/src/apps/chat/util/agi-react.ts +++ b/src/apps/chat/util/agi-react.ts @@ -1,6 +1,6 @@ -import { Agent } from '@/common/llm-util/react'; +import { Agent } from '~/common/llm-util/react'; import { ChatModelId } from '../../../data'; -import { createEphemeral, DMessage, useChatStore } from '@/common/state/store-chats'; +import { createEphemeral, DMessage, useChatStore } from '~/common/state/store-chats'; import { createAssistantTypingMessage } from './agi-immediate'; diff --git a/src/apps/chat/util/ai-functions.ts b/src/apps/chat/util/ai-functions.ts index 587cb6bae..3af222f13 100644 --- a/src/apps/chat/util/ai-functions.ts +++ b/src/apps/chat/util/ai-functions.ts @@ -1,6 +1,7 @@ +import { callChat } from '~/modules/openai/openai.client'; + import { ChatModelId, fastChatModelId } from '../../../data'; -import { callChat } from '@/modules/openai/openai.client'; -import { useChatStore } from '@/common/state/store-chats'; +import { useChatStore } from '~/common/state/store-chats'; /** diff --git a/src/apps/chat/util/imagine.ts b/src/apps/chat/util/imagine.ts index 8e4fa8187..cf76ce22e 100644 --- a/src/apps/chat/util/imagine.ts +++ b/src/apps/chat/util/imagine.ts @@ -1,8 +1,8 @@ -import { Prodia } from '@/modules/prodia/prodia.types'; -import { prodiaDefaultModelId } from '@/modules/prodia/prodia.client'; +import { Prodia } from '~/modules/prodia/prodia.types'; +import { prodiaDefaultModelId } from '~/modules/prodia/prodia.client'; -import { useChatStore } from '@/common/state/store-chats'; -import { useSettingsStore } from '@/common/state/store-settings'; +import { useChatStore } from '~/common/state/store-chats'; +import { useSettingsStore } from '~/common/state/store-settings'; import { createAssistantTypingMessage } from './agi-immediate'; diff --git a/src/apps/settings/SettingsModal.tsx b/src/apps/settings/SettingsModal.tsx index d4c4ff4e3..2e1ed069b 100644 --- a/src/apps/settings/SettingsModal.tsx +++ b/src/apps/settings/SettingsModal.tsx @@ -2,12 +2,12 @@ import * as React from 'react'; import { Box, Button } from '@mui/joy'; -import { ElevenlabsSettings } from '@/modules/elevenlabs/ElevenlabsSettings'; -import { ProdiaSettings } from '@/modules/prodia/ProdiaSettings'; -import { SearchSettings } from '@/modules/search/SearchSettings'; +import { ElevenlabsSettings } from '~/modules/elevenlabs/ElevenlabsSettings'; +import { ProdiaSettings } from '~/modules/prodia/ProdiaSettings'; +import { SearchSettings } from '~/modules/search/SearchSettings'; -import { GoodModal } from '@/common/components/GoodModal'; -import { useUIStore } from '@/common/state/store-ui'; +import { GoodModal } from '~/common/components/GoodModal'; +import { useUIStore } from '~/common/state/store-ui'; import { UISettings } from './UISettings'; diff --git a/src/apps/settings/UISettings.tsx b/src/apps/settings/UISettings.tsx index 9fe20f5a5..a16ef90a6 100644 --- a/src/apps/settings/UISettings.tsx +++ b/src/apps/settings/UISettings.tsx @@ -7,9 +7,9 @@ import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown'; import WidthNormalIcon from '@mui/icons-material/WidthNormal'; import WidthWideIcon from '@mui/icons-material/WidthWide'; -import { Section } from '@/common/components/Section'; -import { hideOnMobile, settingsGap } from '@/common/theme'; -import { useSettingsStore } from '@/common/state/store-settings'; +import { Section } from '~/common/components/Section'; +import { hideOnMobile, settingsGap } from '~/common/theme'; +import { useSettingsStore } from '~/common/state/store-settings'; // languages is defined as a JSON file import languages from './languages.json' assert { type: 'json' }; diff --git a/src/common/layouts/AppLayout.tsx b/src/common/layouts/AppLayout.tsx index bc269d41b..c0bba8f6f 100644 --- a/src/common/layouts/AppLayout.tsx +++ b/src/common/layouts/AppLayout.tsx @@ -3,13 +3,12 @@ import { shallow } from 'zustand/shallow'; import { Box, Container, useTheme } from '@mui/joy'; -import { ModelsModal } from '@/modules/models/ModelsModal'; +import { ModelsModal } from '~/modules/models/ModelsModal'; import { SettingsModal } from '../../apps/settings/SettingsModal'; -import { useSettingsStore } from '@/common/state/store-settings'; - import { ApplicationBar } from './appbar/ApplicationBar'; import { NoSSR } from '../components/NoSSR'; +import { useSettingsStore } from '../state/store-settings'; export function AppLayout(props: { diff --git a/src/common/layouts/appbar/ApplicationBar.tsx b/src/common/layouts/appbar/ApplicationBar.tsx index 0e9bc94ee..c875df06a 100644 --- a/src/common/layouts/appbar/ApplicationBar.tsx +++ b/src/common/layouts/appbar/ApplicationBar.tsx @@ -8,10 +8,9 @@ import MenuIcon from '@mui/icons-material/Menu'; import MoreVertIcon from '@mui/icons-material/MoreVert'; import SettingsOutlinedIcon from '@mui/icons-material/SettingsOutlined'; -import { useUIStore } from '@/common/state/store-ui'; - import { SupportMenuItem } from './SupportMenuItem'; import { useApplicationBarStore } from './useApplicationBarStore'; +import { useUIStore } from '../../state/store-ui'; function CommonContextItems(props: { onClose: () => void }) { diff --git a/src/common/layouts/appbar/SupportMenuItem.tsx b/src/common/layouts/appbar/SupportMenuItem.tsx index 5c1357d80..505b57875 100644 --- a/src/common/layouts/appbar/SupportMenuItem.tsx +++ b/src/common/layouts/appbar/SupportMenuItem.tsx @@ -4,9 +4,9 @@ import { Box, Button, ListItem, SvgIcon, useTheme } from '@mui/joy'; import { SxProps } from '@mui/joy/styles/types'; import GitHubIcon from '@mui/icons-material/GitHub'; -import { Brand } from '@/common/brand'; -import { Link } from '@/common/components/Link'; -import { cssRainbowColorKeyframes } from '@/common/theme'; +import { Brand } from '../../brand'; +import { Link } from '../../components/Link'; +import { cssRainbowColorKeyframes } from '../../theme'; // missing from MUI, using Tabler for Discord diff --git a/src/common/llm-util/react.ts b/src/common/llm-util/react.ts index 5f6ad1a68..49a38dd22 100644 --- a/src/common/llm-util/react.ts +++ b/src/common/llm-util/react.ts @@ -1,6 +1,6 @@ -import { OpenAI } from '@/modules/openai/openai.types'; -import { callApiSearchGoogle } from '@/modules/search/search.client'; -import { callChat } from '@/modules/openai/openai.client'; +import { OpenAI } from '~/modules/openai/openai.types'; +import { callApiSearchGoogle } from '~/modules/search/search.client'; +import { callChat } from '~/modules/openai/openai.client'; import { ChatModelId } from '../../data'; import { currentDate, reActPrompt } from './prompts'; diff --git a/src/common/llm-util/summerize.ts b/src/common/llm-util/summerize.ts index fa517db26..aa05505a6 100644 --- a/src/common/llm-util/summerize.ts +++ b/src/common/llm-util/summerize.ts @@ -1,4 +1,4 @@ -import { callChat } from '@/modules/openai/openai.client'; +import { callChat } from '~/modules/openai/openai.client'; import { ChatModelId, ChatModels } from '../../data'; import { cleanupPrompt } from './prompts'; diff --git a/src/common/util/extractCommands.ts b/src/common/util/extractCommands.ts index 1ba600bde..1cdce1b90 100644 --- a/src/common/util/extractCommands.ts +++ b/src/common/util/extractCommands.ts @@ -1,5 +1,5 @@ -import { CmdRunProdia } from '@/modules/prodia/prodia.client'; -import { CmdRunReact, CmdRunSearch } from '@/modules/search/search.client'; +import { CmdRunProdia } from '~/modules/prodia/prodia.client'; +import { CmdRunReact, CmdRunSearch } from '~/modules/search/search.client'; export const commands = [...CmdRunProdia, ...CmdRunSearch, ...CmdRunReact]; diff --git a/src/modules/elevenlabs/ElevenlabsSettings.tsx b/src/modules/elevenlabs/ElevenlabsSettings.tsx index 68290b7a6..966d0d0b8 100644 --- a/src/modules/elevenlabs/ElevenlabsSettings.tsx +++ b/src/modules/elevenlabs/ElevenlabsSettings.tsx @@ -8,9 +8,9 @@ import RecordVoiceOverIcon from '@mui/icons-material/RecordVoiceOver'; import VisibilityIcon from '@mui/icons-material/Visibility'; import VisibilityOffIcon from '@mui/icons-material/VisibilityOff'; -import { Section } from '@/common/components/Section'; -import { settingsCol1Width, settingsGap } from '@/common/theme'; -import { useSettingsStore } from '@/common/state/store-settings'; +import { Section } from '~/common/components/Section'; +import { settingsCol1Width, settingsGap } from '~/common/theme'; +import { useSettingsStore } from '~/common/state/store-settings'; import { isElevenLabsEnabled, requireUserKeyElevenLabs, useElevenLabsVoices } from './elevenlabs.client'; diff --git a/src/modules/elevenlabs/elevenlabs.client.ts b/src/modules/elevenlabs/elevenlabs.client.ts index 61f64ae33..1c8e1fba9 100644 --- a/src/modules/elevenlabs/elevenlabs.client.ts +++ b/src/modules/elevenlabs/elevenlabs.client.ts @@ -1,6 +1,7 @@ import { ElevenLabs } from './elevenlabs.types'; import { useQuery } from '@tanstack/react-query'; -import { useSettingsStore } from '@/common/state/store-settings'; + +import { useSettingsStore } from '~/common/state/store-settings'; export const requireUserKeyElevenLabs = !process.env.HAS_SERVER_KEY_ELEVENLABS; diff --git a/src/modules/models/AddVendor.tsx b/src/modules/models/AddVendor.tsx index 316ff5c64..51a29cea0 100644 --- a/src/modules/models/AddVendor.tsx +++ b/src/modules/models/AddVendor.tsx @@ -6,7 +6,7 @@ import AddIcon from '@mui/icons-material/Add'; import CloudOutlinedIcon from '@mui/icons-material/CloudOutlined'; import ComputerIcon from '@mui/icons-material/Computer'; -import { hideOnMobile } from '@/common/theme'; +import { hideOnMobile } from '~/common/theme'; import { DModelSourceId, useModelsStore } from './store-models'; import { defaultVendorId, ModelVendorId, rankedVendors } from './vendors-registry'; diff --git a/src/modules/models/ConfigureSources.tsx b/src/modules/models/ConfigureSources.tsx index 0a4359c7f..9770e1064 100644 --- a/src/modules/models/ConfigureSources.tsx +++ b/src/modules/models/ConfigureSources.tsx @@ -7,7 +7,7 @@ import DeleteOutlineIcon from '@mui/icons-material/DeleteOutline'; //import FileDownloadIcon from '@mui/icons-material/FileDownload'; import { DModelSourceId, useModelsStore } from './store-models'; -import { configureVendorSource } from '@/modules/models/vendors-registry'; +import { configureVendorSource } from './vendors-registry'; export function ConfigureSources() { diff --git a/src/modules/models/ModelsModal.tsx b/src/modules/models/ModelsModal.tsx index a5b9b95b2..b23c54ef0 100644 --- a/src/modules/models/ModelsModal.tsx +++ b/src/modules/models/ModelsModal.tsx @@ -3,13 +3,13 @@ import { shallow } from 'zustand/shallow'; import { Divider } from '@mui/joy'; -import { GoodModal } from '@/common/components/GoodModal'; -import { useSettingsStore } from '@/common/state/store-settings'; -import { useUIStore } from '@/common/state/store-ui'; +import { GoodModal } from '~/common/components/GoodModal'; +import { useSettingsStore } from '~/common/state/store-settings'; +import { useUIStore } from '~/common/state/store-ui'; import { AddVendor } from './AddVendor'; import { ConfigureSources } from './ConfigureSources'; -import { EditModels } from '@/modules/models/EditModels'; +import { EditModels } from './EditModels'; export function ModelsModal() { diff --git a/src/modules/models/localai/SourceConfig.tsx b/src/modules/models/localai/SourceConfig.tsx index f4d9c8480..f2147c929 100644 --- a/src/modules/models/localai/SourceConfig.tsx +++ b/src/modules/models/localai/SourceConfig.tsx @@ -2,9 +2,10 @@ import * as React from 'react'; import { FormControl, FormHelperText, FormLabel, Input } from '@mui/joy'; +import { Link } from '~/common/components/Link'; + import { DModelSourceId, useSourceConfigurator } from '../store-models'; import { normConfigLocalAI, SourceConfigLocalAI } from './vendor'; -import { Link } from '@/common/components/Link'; export function SourceConfig(props: { sourceId: DModelSourceId }) { diff --git a/src/modules/models/openai/SourceConfig.tsx b/src/modules/models/openai/SourceConfig.tsx index 2b2257444..09b26736e 100644 --- a/src/modules/models/openai/SourceConfig.tsx +++ b/src/modules/models/openai/SourceConfig.tsx @@ -2,13 +2,13 @@ import * as React from 'react'; import { Box, FormControl, FormHelperText, FormLabel, Input, Slider, Stack } from '@mui/joy'; -import { hasServerKeyOpenAI, isValidOpenAIApiKey } from '@/modules/openai/openai.client'; +import { Brand } from '~/common/brand'; +import { FormInputKey } from '~/common/components/FormInputKey'; +import { Link } from '~/common/components/Link'; +import { Section } from '~/common/components/Section'; +import { settingsCol1Width, settingsGap, settingsMaxWidth } from '~/common/theme'; -import { Brand } from '@/common/brand'; -import { FormInputKey } from '@/common/components/FormInputKey'; -import { Link } from '@/common/components/Link'; -import { Section } from '@/common/components/Section'; -import { settingsCol1Width, settingsGap, settingsMaxWidth } from '@/common/theme'; +import { hasServerKeyOpenAI, isValidOpenAIApiKey } from '../../openai/openai.client'; import { DModelSourceId, useSourceConfigurator } from '../store-models'; import { normConfigOpenAI, SourceConfigOpenAI } from './vendor'; diff --git a/src/modules/openai/openai.client.ts b/src/modules/openai/openai.client.ts index 92aa954d7..a9d0c8383 100644 --- a/src/modules/openai/openai.client.ts +++ b/src/modules/openai/openai.client.ts @@ -1,5 +1,6 @@ import { ChatModelId } from '../../data'; -import { useSettingsStore } from '@/common/state/store-settings'; + +import { useSettingsStore } from '~/common/state/store-settings'; import { OpenAI } from './openai.types'; diff --git a/src/modules/pastegg/PublishedModal.tsx b/src/modules/pastegg/PublishedModal.tsx index 97e483062..87d03ba90 100644 --- a/src/modules/pastegg/PublishedModal.tsx +++ b/src/modules/pastegg/PublishedModal.tsx @@ -2,7 +2,8 @@ import * as React from 'react'; import { Alert, Box, Button, Divider, Input, Modal, ModalDialog, Stack, Typography } from '@mui/joy'; -import { Link } from '@/common/components/Link'; +import { Link } from '~/common/components/Link'; + import { PasteGG } from './pastegg.types'; diff --git a/src/modules/pastegg/pastegg.client.ts b/src/modules/pastegg/pastegg.client.ts index c608c90a4..a1e1533cf 100644 --- a/src/modules/pastegg/pastegg.client.ts +++ b/src/modules/pastegg/pastegg.client.ts @@ -1,6 +1,6 @@ // noinspection ExceptionCaughtLocallyJS -import { Brand } from '@/common/brand'; +import { Brand } from '~/common/brand'; import { PasteGG } from './pastegg.types'; diff --git a/src/modules/prodia/ProdiaSettings.tsx b/src/modules/prodia/ProdiaSettings.tsx index 423ae6574..4b68a5c02 100644 --- a/src/modules/prodia/ProdiaSettings.tsx +++ b/src/modules/prodia/ProdiaSettings.tsx @@ -10,9 +10,9 @@ import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown'; import VisibilityIcon from '@mui/icons-material/Visibility'; import VisibilityOffIcon from '@mui/icons-material/VisibilityOff'; -import { Section } from '@/common/components/Section'; -import { settingsGap } from '@/common/theme'; -import { useSettingsStore } from '@/common/state/store-settings'; +import { Section } from '~/common/components/Section'; +import { settingsGap } from '~/common/theme'; +import { useSettingsStore } from '~/common/state/store-settings'; import { Prodia } from './prodia.types'; import { isValidProdiaApiKey, prodiaDefaultModelId, requireUserKeyProdia } from './prodia.client'; diff --git a/src/modules/search/SearchSettings.tsx b/src/modules/search/SearchSettings.tsx index 44705072e..99606465d 100644 --- a/src/modules/search/SearchSettings.tsx +++ b/src/modules/search/SearchSettings.tsx @@ -4,14 +4,14 @@ import { shallow } from 'zustand/shallow'; import { Box, FormControl, FormHelperText, FormLabel, Input, Stack, Tooltip } from '@mui/joy'; import KeyIcon from '@mui/icons-material/Key'; import SearchIcon from '@mui/icons-material/Search'; +import InfoOutlinedIcon from '@mui/icons-material/InfoOutlined'; -import { Section } from '@/common/components/Section'; -import { settingsCol1Width, settingsGap } from '@/common/theme'; -import { useSettingsStore } from '@/common/state/store-settings'; +import { Link } from '~/common/components/Link'; +import { Section } from '~/common/components/Section'; +import { settingsCol1Width, settingsGap } from '~/common/theme'; +import { useSettingsStore } from '~/common/state/store-settings'; import { isValidGoogleCloudApiKey, isValidGoogleCseId, requireUserKeyGoogleCse } from './search.client'; -import InfoOutlinedIcon from '@mui/icons-material/InfoOutlined'; -import { Link } from '@/common/components/Link'; export function SearchSettings() { diff --git a/src/modules/search/search.client.ts b/src/modules/search/search.client.ts index 38aab81ff..47a95398e 100644 --- a/src/modules/search/search.client.ts +++ b/src/modules/search/search.client.ts @@ -1,4 +1,4 @@ -import { useSettingsStore } from '@/common/state/store-settings'; +import { useSettingsStore } from '~/common/state/store-settings'; import { Search } from './search.types'; diff --git a/tsconfig.json b/tsconfig.json index 98126d836..731f03024 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,8 +1,9 @@ { "compilerOptions": { - "target": "ES6", + "target": "ES2017", "lib": ["dom", "dom.iterable", "esnext"], "allowJs": true, + "checkJs": true, "skipLibCheck": true, "baseUrl": ".", "strict": true, @@ -17,8 +18,8 @@ "incremental": true, "jsxImportSource": "@emotion/react", "paths": { - "@/common/*": ["src/common/*"], - "@/modules/*": ["src/modules/*"] + "~/common/*": ["src/common/*"], + "~/modules/*": ["src/modules/*"] }, }, "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],