Merge remote-tracking branch 'refs/remotes/origin/feat/datacenter'

Conflicts:
	package.json
	packages/app/src/components/create-workspace/index.tsx
	packages/app/src/components/workspace-modal/index.tsx
	packages/app/src/components/workspace-modal/languageMenu.tsx
	packages/app/src/components/workspace-slider-bar/WorkspaceSelector/SelectorPopperContent.tsx
	packages/app/src/components/workspace-slider-bar/index.tsx
	packages/app/src/pages/_app.tsx
	pnpm-lock.yaml
This commit is contained in:
linonetwo
2023-01-10 18:23:25 +08:00
58 changed files with 1188 additions and 3572 deletions
+2 -1
View File
@@ -10,7 +10,7 @@ import { getLogger } from './logger';
import { applyUpdate, encodeStateAsUpdate } from 'yjs';
import { TauriIPCProvider } from './provider/tauri-ipc';
import { createBlocksuiteWorkspace } from './utils/index.js';
import { MessageCenter } from './message/message';
import { MessageCenter } from './message';
/**
* @class DataCenter
@@ -313,6 +313,7 @@ export class DataCenter {
applyUpdate(newWorkspace.doc, encodeStateAsUpdate(workspace.doc));
assert(newWorkspace, 'Create workspace failed');
await currentProvider.deleteWorkspace(workspace.room);
return newWorkspace.room;
}
/**