luulam/AFFiNE
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: merge issue

Browse Source
This commit is contained in:
linonetwo
2023-01-10 18:40:36 +08:00
parent 6645e98a1b
commit 005d3bbaa9
3 changed files with 2289 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/data-center/src/datacenter.ts
View File

@@ -8,7 +8,6 @@ import type { Message, WorkspaceMeta } from './types';
import assert from 'assert'; import assert from 'assert';
import { getLogger } from './logger'; import { getLogger } from './logger';
import { applyUpdate, encodeStateAsUpdate } from 'yjs'; import { applyUpdate, encodeStateAsUpdate } from 'yjs';
import { TauriIPCProvider } from './provider/tauri-ipc';
import { createBlocksuiteWorkspace } from './utils/index.js'; import { createBlocksuiteWorkspace } from './utils/index.js';
import { MessageCenter } from './message'; import { MessageCenter } from './message';
@@ -42,6 +41,7 @@ export class DataCenter {
}; };
// TODO: switch different provider // TODO: switch different provider
if (typeof window !== 'undefined' && window.CLIENT_APP) { if (typeof window !== 'undefined' && window.CLIENT_APP) {
const { TauriIPCProvider } = await import('./provider/tauri-ipc');
dc.registerProvider(new TauriIPCProvider(getInitParams())); dc.registerProvider(new TauriIPCProvider(getInitParams()));
} }
dc.registerProvider(new LocalProvider(getInitParams())); dc.registerProvider(new LocalProvider(getInitParams()));

2
packages/data-center/src/provider/tauri-ipc/index.ts
View File

@@ -4,7 +4,7 @@ import assert from 'assert';
import { LocalProvider } from '../local/index.js'; import { LocalProvider } from '../local/index.js';
import * as ipcMethods from './ipc/methods.js'; import * as ipcMethods from './ipc/methods.js';
import { ProviderConstructorParams } from '../base.js'; import { ProviderConstructorParams } from '../base.js';
import { BlockSchema } from '@blocksuite/blocks/models.js'; import { BlockSchema } from '@blocksuite/blocks/models';
import { Workspace as BlocksuiteWorkspace } from '@blocksuite/store'; import { Workspace as BlocksuiteWorkspace } from '@blocksuite/store';
import { WorkspaceMeta, WorkspaceInfo } from '../../types'; import { WorkspaceMeta, WorkspaceInfo } from '../../types';
import { IPCBlobProvider } from './blocksuite-provider/blob.js'; import { IPCBlobProvider } from './blocksuite-provider/blob.js';

2370
pnpm-lock.yaml generated
View File

File diff suppressed because it is too large Load Diff