remove types file

thomasyuill-livekit · thomasyuill-livekit · commit a53bccb1c335 · 2025-10-09T14:22:10.000-04:00
diff --git a/app-config.ts b/app-config.ts
@@ -1,4 +1,22 @@
-import type { AppConfig } from './lib/types';
+export interface AppConfig {
+  pageTitle: string;
+  pageDescription: string;
+  companyName: string;
+
+  supportsChatInput: boolean;
+  supportsVideoInput: boolean;
+  supportsScreenShare: boolean;
+  isPreConnectBufferEnabled: boolean;
+
+  logo: string;
+  startButtonText: string;
+  accent?: string;
+  logoDark?: string;
+  accentDark?: string;
+
+  sandboxId?: string;
+  agentName?: string;
+}
 
 export const APP_CONFIG_DEFAULTS: AppConfig = {
   companyName: 'LiveKit',
diff --git a/app/api/connection-details/route.ts b/app/api/connection-details/route.ts
@@ -1,7 +1,7 @@
 import { NextResponse } from 'next/server';
 import { AccessToken, type AccessTokenOptions, type VideoGrant } from 'livekit-server-sdk';
 import { RoomConfiguration } from '@livekit/protocol';
-import type { ConnectionDetails } from '@/lib/types';
+import type { ConnectionDetails } from '@/hooks/useConnectionDetails';
 
 // NOTE: you are expected to define the following environment variables in `.env.local`:
 const API_KEY = process.env.LIVEKIT_API_KEY;
diff --git a/app/ui/_room-provider.tsx b/app/ui/_room-provider.tsx
@@ -3,9 +3,9 @@
 import React from 'react';
 import { Room } from 'livekit-client';
 import { RoomContext } from '@livekit/components-react';
+import { AppConfig } from '@/app-config';
 import { toastAlert } from '@/components/livekit/alert-toast';
 import useConnectionDetails from '@/hooks/useConnectionDetails';
-import { AppConfig } from '@/lib/types';
 
 export function RoomProvider({
   appConfig,
diff --git a/app/ui/livekit/page.tsx b/app/ui/livekit/page.tsx
@@ -4,12 +4,12 @@ import { ChatTranscript } from '@/components/app/chat-transcript';
 import { PreConnectMessage } from '@/components/app/preconnect-message';
 import { ThemeToggle } from '@/components/app/theme-toggle';
 import { AgentControlBar } from '@/components/livekit/agent-control-bar/agent-control-bar';
+import { TrackDeviceSelect } from '@/components/livekit/agent-control-bar/track-device-select';
+import { TrackSelector } from '@/components/livekit/agent-control-bar/track-selector';
+import { TrackToggle } from '@/components/livekit/agent-control-bar/track-toggle';
 import { AlertToast } from '@/components/livekit/alert-toast';
 import { ChatEntry } from '@/components/livekit/chat-entry';
 import { ShimmerMessage } from '@/components/livekit/shimmer-message';
-import { TrackDeviceSelect } from '@/components/livekit/track-device-select';
-import { TrackSelector } from '@/components/livekit/track-selector';
-import { TrackToggle } from '@/components/livekit/track-toggle';
 import { Container } from '../_container';
 
 export default function LiveKit() {
diff --git a/components/app/app.tsx b/components/app/app.tsx
@@ -2,11 +2,11 @@
 
 import { AnimatePresence, motion } from 'motion/react';
 import { RoomAudioRenderer, RoomContext, StartAudio } from '@livekit/components-react';
+import type { AppConfig } from '@/app-config';
 import { SessionView } from '@/components/app/session-view';
 import { Welcome } from '@/components/app/welcome';
 import { Toaster } from '@/components/livekit/toaster';
 import { useRoom } from '@/hooks/useRoom';
-import type { AppConfig } from '@/lib/types';
 
 const MotionWelcome = motion.create(Welcome);
 const MotionSessionView = motion.create(SessionView);
diff --git a/components/app/session-view.tsx b/components/app/session-view.tsx
@@ -2,6 +2,7 @@
 
 import React, { useState } from 'react';
 import { motion } from 'motion/react';
+import type { AppConfig } from '@/app-config';
 import { ChatTranscript } from '@/components/app/chat-transcript';
 import { PreConnectMessage } from '@/components/app/preconnect-message';
 import { TileLayout } from '@/components/app/tile-layout';
@@ -13,7 +14,6 @@ import { Skrim } from '@/components/livekit/skrim';
 import { useChatTranscriptions } from '@/hooks/useChatAndTranscription';
 import { useConnectionTimeout } from '@/hooks/useConnectionTimout';
 import { useDebugMode } from '@/hooks/useDebug';
-import type { AppConfig } from '@/lib/types';
 import { cn } from '@/lib/utils';
 import { ScrollArea } from '../livekit/scroll-area';
 
diff --git a/components/app/theme-toggle.tsx b/components/app/theme-toggle.tsx
@@ -2,7 +2,6 @@
 
 import { useEffect, useState } from 'react';
 import { MonitorIcon, MoonIcon, SunIcon } from '@phosphor-icons/react';
-import type { ThemeMode } from '@/lib/types';
 import { THEME_MEDIA_QUERY, THEME_STORAGE_KEY, cn } from '@/lib/utils';
 
 const THEME_SCRIPT = `
@@ -23,6 +22,8 @@ const THEME_SCRIPT = `
   .replace(/\n/g, '')
   .replace(/\s+/g, ' ');
 
+export type ThemeMode = 'dark' | 'light' | 'system';
+
 function applyTheme(theme: ThemeMode) {
   const doc = document.documentElement;
 
diff --git a/components/livekit/agent-control-bar/agent-control-bar.tsx b/components/livekit/agent-control-bar/agent-control-bar.tsx
@@ -4,14 +4,14 @@ import { type HTMLAttributes, useCallback, useState } from 'react';
 import { Track } from 'livekit-client';
 import { useChat, useRemoteParticipants, useRoomContext } from '@livekit/components-react';
 import { ChatTextIcon, PhoneDisconnectIcon } from '@phosphor-icons/react/dist/ssr';
-import { TrackToggle } from '@/components/livekit/track-toggle';
+import { TrackToggle } from '@/components/livekit/agent-control-bar/track-toggle';
 import { Button } from '@/components/ui/button';
 import { Toggle } from '@/components/ui/toggle';
 import { cn } from '@/lib/utils';
-import { TrackSelector } from '../track-selector';
 import { ChatInput } from './chat-input';
 import { UseInputControlsProps, useInputControls } from './hooks/use-input-controls';
 import { usePublishPermissions } from './hooks/use-publish-permissions';
+import { TrackSelector } from './track-selector';
 
 const NOOP = () => {};
 
diff --git a/components/livekit/agent-control-bar/track-device-select.tsx b/components/livekit/agent-control-bar/track-device-select.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { memo, useEffect, useLayoutEffect, useMemo, useState } from 'react';
+import { useEffect, useLayoutEffect, useMemo, useState } from 'react';
 import { cva } from 'class-variance-authority';
 import { LocalAudioTrack, LocalVideoTrack } from 'livekit-client';
 import { useMaybeRoomContext, useMediaDeviceSelect } from '@livekit/components-react';
@@ -40,7 +40,7 @@ const selectVariants = cva(
   }
 );
 
-export const TrackDeviceSelect = memo(function TrackDeviceSelect({
+export function TrackDeviceSelect({
   kind,
   track,
   size = 'default',
@@ -105,4 +105,4 @@ export const TrackDeviceSelect = memo(function TrackDeviceSelect({
       </SelectContent>
     </Select>
   );
-});
+}
diff --git a/components/livekit/agent-control-bar/track-selector.tsx b/components/livekit/agent-control-bar/track-selector.tsx
@@ -5,8 +5,8 @@ import {
   type TrackReferenceOrPlaceholder,
   useTrackToggle,
 } from '@livekit/components-react';
-import { TrackDeviceSelect } from '@/components/livekit/track-device-select';
-import { TrackToggle } from '@/components/livekit/track-toggle';
+import { TrackDeviceSelect } from '@/components/livekit/agent-control-bar/track-device-select';
+import { TrackToggle } from '@/components/livekit/agent-control-bar/track-toggle';
 import { cn } from '@/lib/utils';
 
 interface TrackSelectorProps {
diff --git a/components/livekit/agent-control-bar/track-toggle.tsx b/components/livekit/agent-control-bar/track-toggle.tsx
diff --git a/hooks/useConnectionDetails.ts b/hooks/useConnectionDetails.ts
@@ -1,9 +1,16 @@
 import { useCallback, useEffect, useState } from 'react';
 import { decodeJwt } from 'jose';
-import type { AppConfig, ConnectionDetails } from '@/lib/types';
+import type { AppConfig } from '@/app-config';
 
 const ONE_MINUTE_IN_MILLISECONDS = 60 * 1000;
 
+export type ConnectionDetails = {
+  serverUrl: string;
+  roomName: string;
+  participantName: string;
+  participantToken: string;
+};
+
 export default function useConnectionDetails(appConfig: AppConfig) {
   // Generate room connection details, including:
   //   - A random Room name
diff --git a/hooks/useRoom.ts b/hooks/useRoom.ts
@@ -1,8 +1,8 @@
 import { useEffect, useMemo, useState } from 'react';
 import { Room, RoomEvent } from 'livekit-client';
+import { AppConfig } from '@/app-config';
 import { toastAlert } from '@/components/livekit/alert-toast';
 import useConnectionDetails from '@/hooks/useConnectionDetails';
-import { AppConfig } from '@/lib/types';
 
 export function useRoom(appConfig: AppConfig) {
   const room = useMemo(() => new Room(), []);
diff --git a/lib/types.ts b/lib/types.ts
diff --git a/lib/utils.ts b/lib/utils.ts
@@ -2,14 +2,22 @@ import { cache } from 'react';
 import { type ClassValue, clsx } from 'clsx';
 import { twMerge } from 'tailwind-merge';
 import { APP_CONFIG_DEFAULTS } from '@/app-config';
-import type { AppConfig, SandboxConfig } from './types';
+import type { AppConfig } from '@/app-config';
 
 export const CONFIG_ENDPOINT = process.env.NEXT_PUBLIC_APP_CONFIG_ENDPOINT;
 export const SANDBOX_ID = process.env.SANDBOX_ID;
 
 export const THEME_STORAGE_KEY = 'theme-mode';
 export const THEME_MEDIA_QUERY = '(prefers-color-scheme: dark)';
 
+export interface SandboxConfig {
+  [key: string]:
+    | { type: 'string'; value: string }
+    | { type: 'number'; value: number }
+    | { type: 'boolean'; value: boolean }
+    | null;
+}
+
 export function cn(...inputs: ClassValue[]) {
   return twMerge(clsx(inputs));
 }
