From 60a9572c8806817656e821f20de677c22f9a2500 Mon Sep 17 00:00:00 2001 From: EYHN Date: Wed, 19 Feb 2025 07:32:01 +0000 Subject: [PATCH] fix(core): remove crypto randomuuid api (#10268) --- packages/common/nbstore/package.json | 1 + packages/common/nbstore/src/worker/client.ts | 3 ++- packages/frontend/apps/electron-renderer/package.json | 3 ++- packages/frontend/apps/electron-renderer/src/app.tsx | 3 ++- yarn.lock | 2 ++ 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/packages/common/nbstore/package.json b/packages/common/nbstore/package.json index 90f93a617c..74c4c06a33 100644 --- a/packages/common/nbstore/package.json +++ b/packages/common/nbstore/package.json @@ -22,6 +22,7 @@ "lodash-es": "^4.17.21", "nanoid": "^5.0.9", "rxjs": "^7.8.1", + "uuid": "^11.0.3", "y-protocols": "^1.0.6", "yjs": "^13.6.21" }, diff --git a/packages/common/nbstore/src/worker/client.ts b/packages/common/nbstore/src/worker/client.ts index 72004fced9..1b50bb94ec 100644 --- a/packages/common/nbstore/src/worker/client.ts +++ b/packages/common/nbstore/src/worker/client.ts @@ -1,4 +1,5 @@ import { OpClient, transfer } from '@toeverything/infra/op'; +import { v4 as uuid } from 'uuid'; import { DummyConnection } from '../connection'; import { AwarenessFrontend, BlobFrontend, DocFrontend } from '../frontend'; @@ -33,7 +34,7 @@ export class StoreManagerClient { const { port1, port2 } = new MessageChannel(); const client = new OpClient(port1); - const closeKey = crypto.randomUUID(); + const closeKey = uuid(); this.client .call( diff --git a/packages/frontend/apps/electron-renderer/package.json b/packages/frontend/apps/electron-renderer/package.json index c296ffd2f9..68cfca6efd 100644 --- a/packages/frontend/apps/electron-renderer/package.json +++ b/packages/frontend/apps/electron-renderer/package.json @@ -22,7 +22,8 @@ "next-themes": "^0.4.4", "react": "^19.0.0", "react-dom": "^19.0.0", - "react-router-dom": "^6.28.0" + "react-router-dom": "^6.28.0", + "uuid": "^11.0.3" }, "devDependencies": { "@affine-tools/utils": "workspace:*", diff --git a/packages/frontend/apps/electron-renderer/src/app.tsx b/packages/frontend/apps/electron-renderer/src/app.tsx index 345a12cbf1..45e11d4c4b 100644 --- a/packages/frontend/apps/electron-renderer/src/app.tsx +++ b/packages/frontend/apps/electron-renderer/src/app.tsx @@ -42,6 +42,7 @@ import { Framework, FrameworkRoot, getCurrentStore } from '@toeverything/infra'; import { OpClient } from '@toeverything/infra/op'; import { Suspense } from 'react'; import { RouterProvider } from 'react-router-dom'; +import { v4 as uuid } from 'uuid'; import { DesktopThemeSync } from './theme-sync'; @@ -209,7 +210,7 @@ export function App() { function createStoreManagerClient() { const { port1: portForOpClient, port2: portForWorker } = new MessageChannel(); let portFromWorker: MessagePort | null = null; - let portId = crypto.randomUUID(); + let portId = uuid(); const handleMessage = (ev: MessageEvent) => { if ( diff --git a/yarn.lock b/yarn.lock index 8024c0dca2..f6bd299069 100644 --- a/yarn.lock +++ b/yarn.lock @@ -496,6 +496,7 @@ __metadata: react-dom: "npm:^19.0.0" react-router-dom: "npm:^6.28.0" typescript: "npm:^5.7.2" + uuid: "npm:^11.0.3" languageName: unknown linkType: soft @@ -735,6 +736,7 @@ __metadata: nanoid: "npm:^5.0.9" rxjs: "npm:^7.8.1" socket.io-client: "npm:^4.8.1" + uuid: "npm:^11.0.3" vitest: "npm:3.0.6" y-protocols: "npm:^1.0.6" yjs: "npm:^13.6.21"