diff --git a/packages/app/package.json b/packages/app/package.json index 600ce5c384..7aa5255ea6 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -28,7 +28,6 @@ "css-spring": "^4.1.0", "dayjs": "^1.11.7", "i18next": "^21.9.1", - "lib0": "^0.2.58", "lit": "^2.3.1", "next": "13.0.1", "prettier": "^2.7.1", @@ -36,8 +35,7 @@ "quill-cursors": "^4.0.0", "react": "18.2.0", "react-dom": "18.2.0", - "react-i18next": "^11.18.4", - "y-protocols": "^1.0.5" + "react-i18next": "^11.18.4" }, "devDependencies": { "@types/node": "18.7.18", diff --git a/packages/app/src/providers/app-state-provider/dynamic-blocksuite.tsx b/packages/app/src/providers/app-state-provider/dynamic-blocksuite.tsx index 0e17b6bec0..d6aec4cbf1 100644 --- a/packages/app/src/providers/app-state-provider/dynamic-blocksuite.tsx +++ b/packages/app/src/providers/app-state-provider/dynamic-blocksuite.tsx @@ -13,27 +13,7 @@ import type { LoadWorkspaceHandler, CreateEditorHandler, } from './context'; -import { token } from '@pathfinder/data-services'; -import { WebsocketProvider } from './y-websocket'; - -const getEditorParams = (workspaceId: string) => { - const providers = []; - const params = new URLSearchParams(location.search); - // const room = params.get('room') ?? 'AFFINE-pathfinder'; - // if (params.get('syncMode') === 'websocket') { - // const WebsocketDocProvider = createWebsocketDocProvider( - // `ws://${window.location.host}/collaboration/` - // ); - // providers.push(WebsocketDocProvider); - // } - - providers.push(IndexedDBDocProvider); - - return { - room: workspaceId, - providers, - }; -}; +import { token, WebsocketProvider } from '@pathfinder/data-services'; interface Props { setLoadWorkspaceHandler: (handler: LoadWorkspaceHandler) => void; diff --git a/packages/data-services/package.json b/packages/data-services/package.json index 2af370726e..c3992e8702 100644 --- a/packages/data-services/package.json +++ b/packages/data-services/package.json @@ -26,6 +26,8 @@ "encoding": "^0.1.13", "firebase": "^9.13.0", "ky": "^0.33.0", - "swr": "^2.0.0" + "swr": "^2.0.0", + "lib0": "^0.2.58", + "y-protocols": "^1.0.5" } } diff --git a/packages/data-services/src/index.ts b/packages/data-services/src/index.ts index a5958a67cc..64bd6aa430 100644 --- a/packages/data-services/src/index.ts +++ b/packages/data-services/src/index.ts @@ -1,3 +1,4 @@ export { signInWithGoogle, onAuthStateChanged } from './auth'; export * from './request'; export * from './sdks'; +export * from './websocket'; diff --git a/packages/data-services/src/websocket/index.ts b/packages/data-services/src/websocket/index.ts new file mode 100644 index 0000000000..d6651c22a2 --- /dev/null +++ b/packages/data-services/src/websocket/index.ts @@ -0,0 +1 @@ +export { WebsocketProvider } from './y-websocket'; diff --git a/packages/app/src/providers/app-state-provider/y-websocket.js b/packages/data-services/src/websocket/y-websocket.js similarity index 100% rename from packages/app/src/providers/app-state-provider/y-websocket.js rename to packages/data-services/src/websocket/y-websocket.js diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 78952b959e..2e02d1fa0a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -62,7 +62,6 @@ importers: eslint-config-prettier: ^8.5.0 eslint-plugin-prettier: ^4.2.1 i18next: ^21.9.1 - lib0: ^0.2.58 lit: ^2.3.1 next: 13.0.1 prettier: ^2.7.1 @@ -72,7 +71,6 @@ importers: react-dom: 18.2.0 react-i18next: ^11.18.4 typescript: 4.8.3 - y-protocols: ^1.0.5 dependencies: '@blocksuite/blocks': 0.3.0-20221222060715-f897f05 '@blocksuite/editor': 0.3.0-20221222060715-f897f05 @@ -93,7 +91,6 @@ importers: css-spring: 4.1.0 dayjs: 1.11.7 i18next: 21.10.0 - lib0: 0.2.58 lit: 2.4.0 next: 13.0.1_biqbaboplfbrettd7655fr4n2y prettier: 2.7.1 @@ -102,7 +99,6 @@ importers: react: 18.2.0 react-dom: 18.2.0_react@18.2.0 react-i18next: 11.18.6_vfm63zmruocgezzfl2v26zlzpy - y-protocols: 1.0.5 devDependencies: '@types/node': 18.7.18 '@types/react': 18.0.20 @@ -119,14 +115,18 @@ importers: encoding: ^0.1.13 firebase: ^9.13.0 ky: ^0.33.0 + lib0: ^0.2.58 swr: ^2.0.0 typescript: ^4.8.4 + y-protocols: ^1.0.5 dependencies: axios: 1.2.0 encoding: 0.1.13 firebase: 9.13.0_encoding@0.1.13 ky: 0.33.0 + lib0: 0.2.58 swr: 2.0.0 + y-protocols: 1.0.5 devDependencies: typescript: 4.9.3