Skip to content

There can be more than Notion and Miro. AFFiNE(pronounced [ə‘fain]) is a next-gen knowledge base that brings planning, sorting and creating all together. Privacy first, open-source, customizable and ready to use.

fix(editor): type import in vite worker env (#10856)

doodlewindd8dfea6ccf71
diff --git a/blocksuite/affine/blocks/block-paragraph/src/turbo/paragraph-painter.worker.ts b/blocksuite/affine/blocks/block-paragraph/src/turbo/paragraph-painter.worker.ts
index bc7aa91a33..10dafd2f6f 100644
--- a/blocksuite/affine/blocks/block-paragraph/src/turbo/paragraph-painter.worker.ts
+++ b/blocksuite/affine/blocks/block-paragraph/src/turbo/paragraph-painter.worker.ts
@@ -1,10 +1,10 @@
-import {
- type BlockLayout,
- type BlockLayoutPainter,
- BlockLayoutPainterExtension,
- type TextRect,
- type WorkerToHostMessage,
+import type {
+ BlockLayout,
+ BlockLayoutPainter,
+ TextRect,
+ WorkerToHostMessage,
} from '@blocksuite/affine-gfx-turbo-renderer';
+import { BlockLayoutPainterExtension } from '@blocksuite/affine-gfx-turbo-renderer/painter';
interface SentenceLayout {
text: string;
diff --git a/blocksuite/affine/gfx/turbo-renderer/src/extension/index.ts b/blocksuite/affine/gfx/turbo-renderer/src/extension/index.ts
deleted file mode 100644
index e38a5881c1..0000000000
--- a/blocksuite/affine/gfx/turbo-renderer/src/extension/index.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { createIdentifier } from '@blocksuite/global/di';
-import type { ExtensionType } from '@blocksuite/store';
-
-import type { BlockLayoutPainter } from '../types';
-
-export const BlockPainterProvider = createIdentifier<BlockLayoutPainter>(
- 'block-painter-provider'
-);
-
-export const BlockLayoutPainterExtension = (
- type: string,
- painter: new () => BlockLayoutPainter
-): ExtensionType => {
- return {
- setup: di => {
- di.addImpl(BlockPainterProvider(type), painter);
- },
- };
-};
diff --git a/blocksuite/affine/gfx/turbo-renderer/src/index.ts b/blocksuite/affine/gfx/turbo-renderer/src/index.ts
index c26a98080f..5d088a41de 100644
--- a/blocksuite/affine/gfx/turbo-renderer/src/index.ts
+++ b/blocksuite/affine/gfx/turbo-renderer/src/index.ts
@@ -1,4 +1,3 @@
-export * from './extension';
export * from './layout/block-layout-provider';
export * from './painter/painter.worker';
export * from './text-utils';
diff --git a/blocksuite/affine/gfx/turbo-renderer/src/painter/painter.worker.ts b/blocksuite/affine/gfx/turbo-renderer/src/painter/painter.worker.ts
index 6388780fa0..87eebe3df0 100644
--- a/blocksuite/affine/gfx/turbo-renderer/src/painter/painter.worker.ts
+++ b/blocksuite/affine/gfx/turbo-renderer/src/painter/painter.worker.ts
@@ -1,7 +1,10 @@
-import { Container, type ServiceProvider } from '@blocksuite/global/di';
+import {
+ Container,
+ createIdentifier,
+ type ServiceProvider,
+} from '@blocksuite/global/di';
import type { ExtensionType } from '@blocksuite/store';
-import { BlockPainterProvider } from '../extension';
import type {
BlockLayoutPainter,
HostToWorkerMessage,
@@ -9,6 +12,21 @@ import type {
WorkerToHostMessage,
} from '../types';
+export const BlockPainterProvider = createIdentifier<BlockLayoutPainter>(
+ 'block-painter-provider'
+);
+
+export const BlockLayoutPainterExtension = (
+ type: string,
+ painter: new () => BlockLayoutPainter
+): ExtensionType => {
+ return {
+ setup: di => {
+ di.addImpl(BlockPainterProvider(type), painter);
+ },
+ };
+};
+
export class ViewportLayoutPainter {
private readonly canvas: OffscreenCanvas = new OffscreenCanvas(0, 0);
private ctx: OffscreenCanvasRenderingContext2D | null = null;