From 989e318c57a3836aefd09803920a2631cc958232 Mon Sep 17 00:00:00 2001 From: Saul-Mirone Date: Mon, 23 Dec 2024 13:10:55 +0000 Subject: [PATCH] chore: adjust tsconfig for blocksuite (#9259) change `moduleResolution` to `bundler` --- blocksuite/affine/block-embed/src/effects.ts | 40 +++++++-------- blocksuite/tsconfig.json | 54 +------------------- packages/common/env/src/constant.ts | 2 +- packages/common/infra/tsconfig.json | 2 +- packages/frontend/core/tsconfig.json | 3 ++ tsconfig.json | 2 +- 6 files changed, 28 insertions(+), 75 deletions(-) diff --git a/blocksuite/affine/block-embed/src/effects.ts b/blocksuite/affine/block-embed/src/effects.ts index 1fd00536a..fd6045d58 100644 --- a/blocksuite/affine/block-embed/src/effects.ts +++ b/blocksuite/affine/block-embed/src/effects.ts @@ -1,35 +1,35 @@ -import { EmbedEdgelessBlockComponent } from './embed-figma-block/embed-edgeless-figma-block.js'; -import type { EmbedFigmaBlockService } from './embed-figma-block/embed-figma-service.js'; -import { EmbedFigmaBlockComponent } from './embed-figma-block/index.js'; -import { EmbedEdgelessGithubBlockComponent } from './embed-github-block/embed-edgeless-github-block.js'; +import { EmbedFigmaBlockComponent } from './embed-figma-block'; +import { EmbedEdgelessBlockComponent } from './embed-figma-block/embed-edgeless-figma-block'; +import type { EmbedFigmaBlockService } from './embed-figma-block/embed-figma-service'; import { EmbedGithubBlockComponent, type EmbedGithubBlockService, -} from './embed-github-block/index.js'; -import { EmbedHtmlFullscreenToolbar } from './embed-html-block/components/fullscreen-toolbar.js'; -import { EmbedEdgelessHtmlBlockComponent } from './embed-html-block/embed-edgeless-html-block.js'; -import { EmbedHtmlBlockComponent } from './embed-html-block/index.js'; -import type { insertEmbedLinkedDocCommand } from './embed-linked-doc-block/commands/insert-embed-linked-doc.js'; +} from './embed-github-block'; +import { EmbedEdgelessGithubBlockComponent } from './embed-github-block/embed-edgeless-github-block'; +import { EmbedHtmlBlockComponent } from './embed-html-block'; +import { EmbedHtmlFullscreenToolbar } from './embed-html-block/components/fullscreen-toolbar'; +import { EmbedEdgelessHtmlBlockComponent } from './embed-html-block/embed-edgeless-html-block'; +import { EmbedLinkedDocBlockComponent } from './embed-linked-doc-block'; +import type { insertEmbedLinkedDocCommand } from './embed-linked-doc-block/commands/insert-embed-linked-doc'; import type { InsertedLinkType, insertLinkByQuickSearchCommand, -} from './embed-linked-doc-block/commands/insert-link-by-quick-search.js'; -import { EmbedEdgelessLinkedDocBlockComponent } from './embed-linked-doc-block/embed-edgeless-linked-doc-block.js'; -import type { EmbedLinkedDocBlockConfig } from './embed-linked-doc-block/embed-linked-doc-config.js'; -import { EmbedLinkedDocBlockComponent } from './embed-linked-doc-block/index.js'; -import { EmbedEdgelessLoomBlockComponent } from './embed-loom-block/embed-edgeless-loom-bock.js'; +} from './embed-linked-doc-block/commands/insert-link-by-quick-search'; +import { EmbedEdgelessLinkedDocBlockComponent } from './embed-linked-doc-block/embed-edgeless-linked-doc-block'; +import type { EmbedLinkedDocBlockConfig } from './embed-linked-doc-block/embed-linked-doc-config'; import { EmbedLoomBlockComponent, type EmbedLoomBlockService, -} from './embed-loom-block/index.js'; -import { EmbedSyncedDocCard } from './embed-synced-doc-block/components/embed-synced-doc-card.js'; -import { EmbedEdgelessSyncedDocBlockComponent } from './embed-synced-doc-block/embed-edgeless-synced-doc-block.js'; -import { EmbedSyncedDocBlockComponent } from './embed-synced-doc-block/index.js'; -import { EmbedEdgelessYoutubeBlockComponent } from './embed-youtube-block/embed-edgeless-youtube-block.js'; +} from './embed-loom-block'; +import { EmbedEdgelessLoomBlockComponent } from './embed-loom-block/embed-edgeless-loom-bock'; +import { EmbedSyncedDocBlockComponent } from './embed-synced-doc-block'; +import { EmbedSyncedDocCard } from './embed-synced-doc-block/components/embed-synced-doc-card'; +import { EmbedEdgelessSyncedDocBlockComponent } from './embed-synced-doc-block/embed-edgeless-synced-doc-block'; import { EmbedYoutubeBlockComponent, type EmbedYoutubeBlockService, -} from './embed-youtube-block/index.js'; +} from './embed-youtube-block'; +import { EmbedEdgelessYoutubeBlockComponent } from './embed-youtube-block/embed-edgeless-youtube-block'; export function effects() { customElements.define( diff --git a/blocksuite/tsconfig.json b/blocksuite/tsconfig.json index 816c407bf..b5390ef14 100644 --- a/blocksuite/tsconfig.json +++ b/blocksuite/tsconfig.json @@ -2,9 +2,9 @@ "extends": "../tsconfig.json", "compilerOptions": { "useDefineForClassFields": false, - "module": "NodeNext", + "module": "ESNext", "lib": ["ESNext", "DOM", "DOM.Iterable"], - "moduleResolution": "NodeNext", + "moduleResolution": "Bundler", "esModuleInterop": true, "noEmitOnError": true, "noUnusedLocals": true, @@ -16,56 +16,6 @@ "composite": true }, "files": [], - "references": [ - { - "path": "./framework/block-std" - }, - { - "path": "./framework/store" - }, - { - "path": "./framework/global" - }, - { - "path": "./framework/inline" - }, - { - "path": "./blocks" - }, - { - "path": "./presets" - }, - { - "path": "./affine/all" - }, - { - "path": "./affine/block-embed" - }, - { - "path": "./affine/block-list" - }, - { - "path": "./affine/block-paragraph" - }, - { - "path": "./affine/block-surface" - }, - { - "path": "./affine/components" - }, - { - "path": "./affine/data-view" - }, - { - "path": "./affine/model" - }, - { - "path": "./affine/shared" - }, - { - "path": "./affine/widget-scroll-anchoring" - } - ], "ts-node": { "esm": true, "experimentalSpecifierResolution": "node", diff --git a/packages/common/env/src/constant.ts b/packages/common/env/src/constant.ts index 1c91e6db4..ee83ac852 100644 --- a/packages/common/env/src/constant.ts +++ b/packages/common/env/src/constant.ts @@ -4,7 +4,7 @@ import type { DocCollection } from '@blocksuite/affine/store'; declare global { - // eslint-disable-next-line no-var + // oxlint-disable-next-line no-var var __appInfo: { electron: boolean; scheme: string; diff --git a/packages/common/infra/tsconfig.json b/packages/common/infra/tsconfig.json index 5a5e7d4e4..acf0872da 100644 --- a/packages/common/infra/tsconfig.json +++ b/packages/common/infra/tsconfig.json @@ -14,7 +14,7 @@ "path": "../debug" }, { - "path": "../../../blocksuite/tsconfig.json" + "path": "../../../blocksuite/affine/all" }, { "path": "./tsconfig.node.json" diff --git a/packages/frontend/core/tsconfig.json b/packages/frontend/core/tsconfig.json index 4287c4216..732b8e71f 100644 --- a/packages/frontend/core/tsconfig.json +++ b/packages/frontend/core/tsconfig.json @@ -26,6 +26,9 @@ { "path": "../../common/env" }, + { + "path": "../../../blocksuite/affine/all" + }, { "path": "./tsconfig.node.json" }, diff --git a/tsconfig.json b/tsconfig.json index c5634e98a..0ef781518 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -159,7 +159,7 @@ }, // Blocksuite { - "path": "./blocksuite" + "path": "./blocksuite/affine/all" }, // Others {