Skip to content

Commit 9b03e37

Browse files
authored
Merge dev to main (#10)
* do not block window closing when running in electron * replace node crypto UUID with uid package
1 parent 3b21d83 commit 9b03e37

2 files changed

Lines changed: 7 additions & 1 deletion

File tree

client/src/components/ChatPane.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,10 @@ export default function ChatPane() {
184184
};
185185

186186
useEffect(() => {
187+
if (window.yozakura) {
188+
return undefined;
189+
}
190+
187191
const handleBeforeUnload = (event: BeforeUnloadEvent) => {
188192
if (transcript?.countAllMessages() === 0) {
189193
return undefined;

client/src/util/id.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
import { uid } from 'uid';
2+
13
export function newId() {
2-
return crypto.randomUUID().replaceAll('-', '');
4+
return uid(18);
35
}
46

57
export function addOrReplaceVersionQueryParam(path: string) {

0 commit comments

Comments
 (0)