Skip to content

fix: replace require() with static ESM import for Tauri events #464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jakeefr wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: replace require() with static ESM import for Tauri events #464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 1 addition & 30 deletions src/components/ClaudeCodeSession.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,37 +16,8 @@ import { Popover } from "@/components/ui/popover";
import { api, type Session } from "@/lib/api";
import { cn } from "@/lib/utils";

// Conditional imports for Tauri APIs
let tauriListen: any;
import { listen } from "@tauri-apps/api/event";
type UnlistenFn = () => void;

try {
if (typeof window !== 'undefined' && window.__TAURI__) {
tauriListen = require("@tauri-apps/api/event").listen;
}
} catch (e) {
console.log('[ClaudeCodeSession] Tauri APIs not available, using web mode');
}

// Web-compatible replacements
const listen = tauriListen || ((eventName: string, callback: (event: any) => void) => {
console.log('[ClaudeCodeSession] Setting up DOM event listener for:', eventName);

// In web mode, listen for DOM events
const domEventHandler = (event: any) => {
console.log('[ClaudeCodeSession] DOM event received:', eventName, event.detail);
// Simulate Tauri event structure
callback({ payload: event.detail });
};

window.addEventListener(eventName, domEventHandler);

// Return unlisten function
return Promise.resolve(() => {
console.log('[ClaudeCodeSession] Removing DOM event listener for:', eventName);
window.removeEventListener(eventName, domEventHandler);
});
});
import { StreamMessage } from "./StreamMessage";
import { FloatingPromptInput, type FloatingPromptInputRef } from "./FloatingPromptInput";
import { ErrorBoundary } from "./ErrorBoundary";
Expand Down
10 changes: 1 addition & 9 deletions src/components/claude-code-session/useClaudeMessages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,7 @@ import { api } from '@/lib/api';
import { getEnvironmentInfo } from '@/lib/apiAdapter';
import type { ClaudeStreamMessage } from '../AgentExecution';

// Conditional import for Tauri
let tauriListen: any;
try {
if (typeof window !== 'undefined' && window.__TAURI__) {
tauriListen = require('@tauri-apps/api/event').listen;
}
} catch (e) {
console.log('[useClaudeMessages] Tauri event API not available, using web mode');
}
import { listen as tauriListen } from '@tauri-apps/api/event';

interface UseClaudeMessagesOptions {
onSessionInfo?: (info: { sessionId: string; projectId: string }) => void;
Expand Down