Jayden/AFFiNE-Mirror
0
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-07-22 04:26:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: bump blocksuite (#5575)

Browse Source
This commit is contained in:
regischen
2024-01-12 12:41:27 +08:00
committed by 李华桥
parent d25a8547d0
commit 8e7dedfe82
16 changed files with 221 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/common/env/package.json
Vendored
+2 -2
View File
@@ -3,8 +3,8 @@
"private": true,
"type": "module",
"devDependencies": {
"@blocksuite/global": "0.11.0-nightly-202401020419-752a5b8",
"@blocksuite/store": "0.11.0-nightly-202401020419-752a5b8",
"@blocksuite/global": "0.12.0-nightly-202401120404-4219e86",
"@blocksuite/store": "0.12.0-nightly-202401120404-4219e86",
"react": "18.2.0",
"react-dom": "18.2.0",
"vitest": "1.1.3"
packages/common/infra/package.json
+5 -5
View File
@@ -13,9 +13,9 @@
"@affine/debug": "workspace:*",
"@affine/env": "workspace:*",
"@affine/templates": "workspace:*",
"@blocksuite/blocks": "0.11.0-nightly-202401020419-752a5b8",
"@blocksuite/global": "0.11.0-nightly-202401020419-752a5b8",
"@blocksuite/store": "0.11.0-nightly-202401020419-752a5b8",
"@blocksuite/blocks": "0.12.0-nightly-202401120404-4219e86",
"@blocksuite/global": "0.12.0-nightly-202401120404-4219e86",
"@blocksuite/store": "0.12.0-nightly-202401120404-4219e86",
"jotai": "^2.5.1",
"jotai-effect": "^0.2.3",
"nanoid": "^5.0.3",
@@ -26,8 +26,8 @@
"devDependencies": {
"@affine-test/fixtures": "workspace:*",
"@affine/templates": "workspace:*",
"@blocksuite/lit": "0.11.0-nightly-202401020419-752a5b8",
"@blocksuite/presets": "0.11.0-nightly-202401020419-752a5b8",
"@blocksuite/lit": "0.12.0-nightly-202401120404-4219e86",
"@blocksuite/presets": "0.12.0-nightly-202401120404-4219e86",
"async-call-rpc": "^6.3.1",
"react": "^18.2.0",
"rxjs": "^7.8.1",
packages/common/y-indexeddb/package.json
+3 -3
View File
@@ -32,14 +32,14 @@
}
},
"dependencies": {
"@blocksuite/global": "0.11.0-nightly-202401020419-752a5b8",
"@blocksuite/global": "0.12.0-nightly-202401120404-4219e86",
"idb": "^8.0.0",
"nanoid": "^5.0.3",
"y-provider": "workspace:*"
},
"devDependencies": {
"@blocksuite/blocks": "0.11.0-nightly-202401020419-752a5b8",
"@blocksuite/store": "0.11.0-nightly-202401020419-752a5b8",
"@blocksuite/blocks": "0.12.0-nightly-202401120404-4219e86",
"@blocksuite/store": "0.12.0-nightly-202401120404-4219e86",
"fake-indexeddb": "^5.0.0",
"vite": "^5.0.6",
"vite-plugin-dts": "3.7.0",
packages/common/y-provider/package.json
+1 -1
View File
@@ -24,7 +24,7 @@
"build": "vite build"
},
"devDependencies": {
"@blocksuite/store": "0.11.0-nightly-202401020419-752a5b8",
"@blocksuite/store": "0.12.0-nightly-202401120404-4219e86",
"vite": "^5.0.6",
"vite-plugin-dts": "3.7.0",
"vitest": "1.1.3",
packages/frontend/component/package.json
+5 -5
View File
@@ -71,12 +71,12 @@
"uuid": "^9.0.1"
},
"devDependencies": {
"@blocksuite/blocks": "0.11.0-nightly-202401020419-752a5b8",
"@blocksuite/global": "0.11.0-nightly-202401020419-752a5b8",
"@blocksuite/blocks": "0.12.0-nightly-202401120404-4219e86",
"@blocksuite/global": "0.12.0-nightly-202401120404-4219e86",
"@blocksuite/icons": "2.1.40",
"@blocksuite/lit": "0.11.0-nightly-202401020419-752a5b8",
"@blocksuite/presets": "0.11.0-nightly-202401020419-752a5b8",
"@blocksuite/store": "0.11.0-nightly-202401020419-752a5b8",
"@blocksuite/lit": "0.12.0-nightly-202401120404-4219e86",
"@blocksuite/presets": "0.12.0-nightly-202401120404-4219e86",
"@blocksuite/store": "0.12.0-nightly-202401120404-4219e86",
"@storybook/addon-actions": "^7.5.3",
"@storybook/addon-essentials": "^7.5.3",
"@storybook/addon-interactions": "^7.5.3",
packages/frontend/core/package.json
+7 -7
View File
@@ -26,14 +26,14 @@
"@affine/templates": "workspace:*",
"@affine/workspace": "workspace:*",
"@affine/workspace-impl": "workspace:*",
"@blocksuite/block-std": "0.11.0-nightly-202401020419-752a5b8",
"@blocksuite/blocks": "0.11.0-nightly-202401020419-752a5b8",
"@blocksuite/global": "0.11.0-nightly-202401020419-752a5b8",
"@blocksuite/block-std": "0.12.0-nightly-202401120404-4219e86",
"@blocksuite/blocks": "0.12.0-nightly-202401120404-4219e86",
"@blocksuite/global": "0.12.0-nightly-202401120404-4219e86",
"@blocksuite/icons": "2.1.40",
"@blocksuite/inline": "0.11.0-nightly-202401020419-752a5b8",
"@blocksuite/lit": "0.11.0-nightly-202401020419-752a5b8",
"@blocksuite/presets": "0.11.0-nightly-202401020419-752a5b8",
"@blocksuite/store": "0.11.0-nightly-202401020419-752a5b8",
"@blocksuite/inline": "0.12.0-nightly-202401120404-4219e86",
"@blocksuite/lit": "0.12.0-nightly-202401120404-4219e86",
"@blocksuite/presets": "0.12.0-nightly-202401120404-4219e86",
"@blocksuite/store": "0.12.0-nightly-202401120404-4219e86",
"@dnd-kit/core": "^6.0.8",
"@dnd-kit/sortable": "^8.0.0",
"@emotion/cache": "^11.11.0",
packages/frontend/core/src/components/page-list/operation-menu-items/get-content-parser.ts
-18
View File
@@ -1,18 +0,0 @@
import { ContentParser } from '@blocksuite/blocks/content-parser';
import type { Page } from '@blocksuite/store';
const contentParserWeakMap = new WeakMap<Page, ContentParser>();
export function getContentParser(page: Page) {
if (!contentParserWeakMap.has(page)) {
contentParserWeakMap.set(
page,
new ContentParser(page, {
imageProxyEndpoint: !environment.isDesktop
? runtimeConfig.imageProxyUrl
: undefined,
})
);
}
return contentParserWeakMap.get(page) as ContentParser;
}
packages/frontend/core/src/hooks/affine/use-export-page.ts
+12 -21
View File
@@ -5,12 +5,12 @@ import {
import { pushNotificationAtom } from '@affine/component/notification-center';
import { apis } from '@affine/electron-api';
import { useAFFiNEI18N } from '@affine/i18n/hooks';
import type { PageService } from '@blocksuite/blocks';
import {
HtmlTransformer,
MarkdownTransformer,
type PageBlockModel,
} from '@blocksuite/blocks';
import { ContentParser } from '@blocksuite/blocks/content-parser';
import type { Page } from '@blocksuite/store';
import { useSetAtom } from 'jotai';
import { nanoid } from 'nanoid';
@@ -18,29 +18,17 @@ import { useCallback } from 'react';
type ExportType = 'pdf' | 'html' | 'png' | 'markdown';
const contentParserWeakMap = new WeakMap<Page, ContentParser>();
const getContentParser = (page: Page) => {
if (!contentParserWeakMap.has(page)) {
contentParserWeakMap.set(
page,
new ContentParser(page, {
imageProxyEndpoint: !environment.isDesktop
? runtimeConfig.imageProxyUrl
: undefined,
})
);
}
return contentParserWeakMap.get(page) as ContentParser;
};
interface ExportHandlerOptions {
page: Page;
type: ExportType;
}
async function exportHandler({ page, type }: ExportHandlerOptions) {
const contentParser = getContentParser(page);
const editorRoot = document.querySelector('editor-host');
let pageService: PageService | null = null;
if (editorRoot) {
pageService = editorRoot.spec.getService('affine:page') as PageService;
}
switch (type) {
case 'html':
await HtmlTransformer.exportPage(page);
@@ -54,12 +42,15 @@ async function exportHandler({ page, type }: ExportHandlerOptions) {
(page.root as PageBlockModel).title.toString()
);
} else {
await contentParser['exportPdf']();
if (!pageService) return;
await pageService.exportManager.exportPdf();
}
break;
case 'png':
await contentParser['exportPng']();
case 'png': {
if (!pageService) return;
await pageService.exportManager.exportPng();
break;
}
}
}
packages/frontend/electron/package.json
+4 -4
View File
@@ -25,10 +25,10 @@
"@affine-test/kit": "workspace:*",
"@affine/env": "workspace:*",
"@affine/native": "workspace:*",
"@blocksuite/blocks": "0.11.0-nightly-202401020419-752a5b8",
"@blocksuite/lit": "0.11.0-nightly-202401020419-752a5b8",
"@blocksuite/presets": "0.11.0-nightly-202401020419-752a5b8",
"@blocksuite/store": "0.11.0-nightly-202401020419-752a5b8",
"@blocksuite/blocks": "0.12.0-nightly-202401120404-4219e86",
"@blocksuite/lit": "0.12.0-nightly-202401120404-4219e86",
"@blocksuite/presets": "0.12.0-nightly-202401120404-4219e86",
"@blocksuite/store": "0.12.0-nightly-202401120404-4219e86",
"@electron-forge/cli": "^7.2.0",
"@electron-forge/core": "^7.2.0",
"@electron-forge/core-utils": "^7.2.0",