fix: type import (#2715)

packages/component/src/components/app-sidebar/app-updater-button/index.jotai.ts

@@ -35,22 +35,14 @@ function rpcToObservable<
   });
 }
 
-type InferTFromEvent<E> = E extends (
-  callback: (t: infer T) => void
-) => () => void
-  ? T
-  : never;
-
-type UpdateMeta = InferTFromEvent<typeof window.events.updater.onUpdateReady>;
-
 export const updateReadyAtom = atomWithObservable(() => {
-  return rpcToObservable(null as UpdateMeta | null, {
+  return rpcToObservable(null as any | null, {
     event: window.events?.updater.onUpdateReady,
   });
 });
 
 export const updateAvailableAtom = atomWithObservable(() => {
-  return rpcToObservable(null as UpdateMeta | null, {
+  return rpcToObservable(null as any | null, {
     event: window.events?.updater.onUpdateAvailable,
     onSubscribe: () => {
       window.apis?.updater.checkForUpdatesAndNotify();

packages/component/src/index.ts

@@ -1,6 +1,3 @@
-// eslint-disable-next-line @typescript-eslint/triple-slash-reference
-/// <reference path="../../../apps/electron/layers/preload/preload.d.ts" />
-
 export * from './components/list-skeleton';
 export * from './styles';
 export * from './ui/breadcrumbs';

packages/env/src/config.ts

@@ -1,12 +1,20 @@
 /// <reference types="@blocksuite/global" />
-// eslint-disable-next-line @typescript-eslint/triple-slash-reference
-/// <reference path="./global.d.ts" />
 import { assertEquals } from '@blocksuite/global/utils';
 import getConfig from 'next/config';
 import { z } from 'zod';
 
 import { UaHelper } from './ua-helper';
 
+declare global {
+  interface Window {
+    appInfo: {
+      electron: boolean;
+    };
+    apis: any;
+    events: any;
+  }
+}
+
 export const buildFlagsSchema = z.object({
   /**
    * todo: remove this build flag when filter feature is ready.

packages/env/src/global.d.ts

@@ -1,5 +0,0 @@
-interface Window {
-  appInfo: {
-    electron: bool;
-  };
-}

packages/env/tsconfig.json

@@ -1,10 +1,9 @@
 {
   "extends": "../../tsconfig.json",
+  "include": ["./src"],
   "compilerOptions": {
-    "noEmit": false,
     "composite": true,
+    "noEmit": false,
     "outDir": "lib"
-  },
-  "include": ["./src", "env.d.ts", "./src/global.d.ts"],
-  "exclude": ["lib"]
+  }
 }

packages/graphql/tsconfig.json

@@ -1,10 +1,9 @@
 {
   "extends": "../../tsconfig.json",
+  "include": ["./src"],
   "compilerOptions": {
-    "target": "ESNext",
-    "module": "ESNext",
-    "rootDir": "./src",
-    "noEmit": true
-  },
-  "include": ["src"]
+    "composite": true,
+    "noEmit": false,
+    "outDir": "lib"
+  }
 }

packages/hooks/tsconfig.json

@@ -1,10 +1,10 @@
 {
   "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "lib",
-    "composite": true,
-    "noEmit": false
-  },
   "include": ["./src"],
+  "compilerOptions": {
+    "composite": true,
+    "noEmit": false,
+    "outDir": "lib"
+  },
   "references": [{ "path": "../env" }, { "path": "../y-indexeddb" }]
 }

packages/jotai/tsconfig.json

@@ -1,14 +1,10 @@
 {
   "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "module": "ESNext",
-    "target": "ESNext",
-    "sourceMap": true,
-    "noEmit": false,
-    "outDir": "lib",
-    "composite": true
-  },
   "include": ["./src"],
-  "exclude": ["node_modules"],
+  "compilerOptions": {
+    "composite": true,
+    "noEmit": false,
+    "outDir": "lib"
+  },
   "references": [{ "path": "../env" }]
 }

packages/plugin-infra/tsconfig.json

@@ -1,6 +1,11 @@
 {
   "extends": "../../tsconfig.json",
   "include": ["./src"],
+  "compilerOptions": {
+    "composite": true,
+    "noEmit": false,
+    "outDir": "lib"
+  },
   "references": [
     {
       "path": "../component"
@@ -8,10 +13,5 @@
     {
       "path": "../workspace"
     }
-  ],
-  "compilerOptions": {
-    "noEmit": false,
-    "composite": true,
-    "outDir": "lib"
-  }
+  ]
 }

packages/storybook/tsconfig.json

@@ -1,7 +1,6 @@
 {
   "extends": "../../tsconfig.json",
-  "exclude": ["lib"],
-  "include": ["src"],
+  "include": ["./src"],
   "compilerOptions": {
     "composite": true,
     "noEmit": false,

packages/workspace/src/local/crud.ts

@@ -102,9 +102,11 @@ export const CRUD: WorkspaceCRUD<WorkspaceFlavour.LOCAL> = {
 
     // workspaces in desktop
     if (window.apis && environment.isDesktop) {
+      // @ts-expect-error
       const desktopIds = (await window.apis.workspace.list()).map(([id]) => id);
       // the ids maybe a subset of the local storage
       const moreWorkspaces = desktopIds.filter(
+        // @ts-expect-error
         id => !allWorkspaceIDs.includes(id)
       );
       allWorkspaceIDs = [...allWorkspaceIDs, ...moreWorkspaces];

packages/workspace/src/providers/__tests__/sqlite-provider.spec.ts

@@ -39,6 +39,7 @@ vi.stubGlobal('window', {
   },
   events: {
     db: {
+      // @ts-expect-error
       onExternalUpdate: fn => {
         triggerDBUpdate = fn;
         return () => {
@@ -113,6 +114,7 @@ describe('SQLite download provider', () => {
 
     offlineYdoc.getText('text').insert(0, 'sqlite-world');
 
+    // @ts-expect-error
     triggerDBUpdate?.({
       workspaceId: id + '-another-id',
       update: Y.encodeStateAsUpdate(offlineYdoc),
@@ -121,6 +123,7 @@ describe('SQLite download provider', () => {
     // not yet updated (because the workspace id is different)
     expect(workspace.doc.getText('text').toString()).toBe('');
 
+    // @ts-expect-error
     triggerDBUpdate?.({
       workspaceId: id,
       update: Y.encodeStateAsUpdate(offlineYdoc),

packages/workspace/src/providers/index.ts

@@ -183,6 +183,7 @@ const createSQLiteProvider = (
   const connect = () => {
     logger.info('connecting sqlite provider', blockSuiteWorkspace.id);
     blockSuiteWorkspace.doc.on('update', handleUpdate);
+    // @ts-expect-error
     unsubscribe = events.db.onExternalUpdate(({ update, workspaceId }) => {
       if (workspaceId === blockSuiteWorkspace.id) {
         Y.applyUpdate(blockSuiteWorkspace.doc, update, sqliteOrigin);

packages/workspace/src/type.ts

@@ -1,17 +1,11 @@
-// eslint-disable-next-line @typescript-eslint/triple-slash-reference
-/// <reference path="../../../apps/electron/layers/preload/preload.d.ts" />
-
 import type { View } from '@affine/component/page-list/filter/shared-types';
 import type { EditorContainer } from '@blocksuite/editor';
 import type { Page } from '@blocksuite/store';
 import type { Workspace as BlockSuiteWorkspace } from '@blocksuite/store';
-import type { createStore } from 'jotai';
 import type { FC, PropsWithChildren } from 'react';
 
 import type { Workspace as RemoteWorkspace } from './affine/api';
 
-export type JotaiStore = ReturnType<typeof createStore>;
-
 export enum WorkspaceSubPath {
   ALL = 'all',
   SETTING = 'setting',

packages/workspace/tsconfig.json

@@ -1,12 +1,11 @@
 {
   "extends": "../../tsconfig.json",
+  "include": ["./src"],
   "compilerOptions": {
     "composite": true,
     "noEmit": false,
     "outDir": "lib"
   },
-  "include": ["./src", "./src/affine/api"],
-  "exclude": ["lib"],
   "references": [
     { "path": "../../tests/fixtures" },
     { "path": "../y-indexeddb" },