diff --git a/oxlint.json b/oxlint.json new file mode 100644 index 0000000000..2ff1e8a4c2 --- /dev/null +++ b/oxlint.json @@ -0,0 +1,10 @@ +{ + "rules": { + "import/no-cycle": [ + "error", + { + "ignoreTypes": true + } + ] + } +} diff --git a/package.json b/package.json index f3b3308915..6acf5e438b 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "lint:eslint:fix": "yarn lint:eslint --fix", "lint:prettier": "prettier --ignore-unknown --cache --check .", "lint:prettier:fix": "prettier --ignore-unknown --cache --write .", - "lint:ox": "oxlint --import-plugin --deny-warnings -D correctness -D nursery -D prefer-array-some -D no-useless-promise-resolve-reject -D perf -A no-undef -A consistent-type-exports -A default -A named -A ban-ts-comment -A export -A no-unresolved -A no-default-export -A no-duplicates -A no-side-effects-in-initialization -A no-named-as-default -A getter-return", + "lint:ox": "oxlint -c oxlint.json --import-plugin --deny-warnings -D correctness -D nursery -D prefer-array-some -D no-useless-promise-resolve-reject -D perf -A no-undef -A consistent-type-exports -A default -A named -A ban-ts-comment -A export -A no-unresolved -A no-default-export -A no-duplicates -A no-side-effects-in-initialization -A no-named-as-default -A getter-return", "lint": "yarn lint:eslint && yarn lint:prettier", "lint:fix": "yarn lint:eslint:fix && yarn lint:prettier:fix", "test": "vitest --run", @@ -97,7 +97,7 @@ "nanoid": "^5.0.7", "nx": "^18.2.4", "nyc": "^15.1.0", - "oxlint": "0.2.14", + "oxlint": "0.2.17", "prettier": "^3.2.5", "semver": "^7.6.0", "serve": "^14.2.1", diff --git a/packages/backend/server/src/fundamentals/config/def.ts b/packages/backend/server/src/fundamentals/config/def.ts index c4c110be3b..6517293d2c 100644 --- a/packages/backend/server/src/fundamentals/config/def.ts +++ b/packages/backend/server/src/fundamentals/config/def.ts @@ -2,7 +2,6 @@ import type { ApolloDriverConfig } from '@nestjs/apollo'; import SMTPTransport from 'nodemailer/lib/smtp-transport'; import type { LeafPaths } from '../utils/types'; -import { EnvConfigType } from './env'; import type { AFFiNEStorageConfig } from './storage'; declare global { @@ -13,6 +12,7 @@ declare global { } } +export type EnvConfigType = 'string' | 'int' | 'float' | 'boolean'; export type ServerFlavor = 'allinone' | 'graphql' | 'sync'; export type AFFINE_ENV = 'dev' | 'beta' | 'production'; export type NODE_ENV = 'development' | 'test' | 'production'; diff --git a/packages/backend/server/src/fundamentals/config/env.ts b/packages/backend/server/src/fundamentals/config/env.ts index 21c16c4738..b05065f4cd 100644 --- a/packages/backend/server/src/fundamentals/config/env.ts +++ b/packages/backend/server/src/fundamentals/config/env.ts @@ -1,8 +1,7 @@ import { set } from 'lodash-es'; -import type { AFFiNEConfig } from './def'; +import type { AFFiNEConfig, EnvConfigType } from './def'; -export type EnvConfigType = 'string' | 'int' | 'float' | 'boolean'; /** * parse number value from environment variables */ diff --git a/packages/common/infra/src/page/page.ts b/packages/common/infra/src/page/page.ts index bd28834a24..c76f8fa56a 100644 --- a/packages/common/infra/src/page/page.ts +++ b/packages/common/infra/src/page/page.ts @@ -1,6 +1,6 @@ import type { Doc as BlockSuiteDoc } from '@blocksuite/store'; -import type { ServiceProvider } from '@toeverything/infra'; +import type { ServiceProvider } from '../di/core'; import type { PageMode, PageRecord } from './record'; export class Doc { diff --git a/packages/common/infra/src/workspace/list/information.ts b/packages/common/infra/src/workspace/list/information.ts index a9ff2363c5..10b35203a3 100644 --- a/packages/common/infra/src/workspace/list/information.ts +++ b/packages/common/infra/src/workspace/list/information.ts @@ -1,7 +1,7 @@ import { DebugLogger } from '@affine/debug'; import { Slot } from '@blocksuite/global/utils'; -import type { Memento } from '../..'; +import type { Memento } from '../../storage/memento'; import type { WorkspaceMetadata } from '../metadata'; import type { Workspace } from '../workspace'; import type { WorkspaceListProvider } from '.'; diff --git a/yarn.lock b/yarn.lock index b148aad618..f4bda912e8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -608,7 +608,7 @@ __metadata: nanoid: "npm:^5.0.7" nx: "npm:^18.2.4" nyc: "npm:^15.1.0" - oxlint: "npm:0.2.14" + oxlint: "npm:0.2.17" prettier: "npm:^3.2.5" semver: "npm:^7.6.0" serve: "npm:^14.2.1" @@ -9619,58 +9619,58 @@ __metadata: languageName: node linkType: hard -"@oxlint/darwin-arm64@npm:0.2.14": - version: 0.2.14 - resolution: "@oxlint/darwin-arm64@npm:0.2.14" +"@oxlint/darwin-arm64@npm:0.2.17": + version: 0.2.17 + resolution: "@oxlint/darwin-arm64@npm:0.2.17" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@oxlint/darwin-x64@npm:0.2.14": - version: 0.2.14 - resolution: "@oxlint/darwin-x64@npm:0.2.14" +"@oxlint/darwin-x64@npm:0.2.17": + version: 0.2.17 + resolution: "@oxlint/darwin-x64@npm:0.2.17" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@oxlint/linux-arm64-gnu@npm:0.2.14": - version: 0.2.14 - resolution: "@oxlint/linux-arm64-gnu@npm:0.2.14" +"@oxlint/linux-arm64-gnu@npm:0.2.17": + version: 0.2.17 + resolution: "@oxlint/linux-arm64-gnu@npm:0.2.17" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@oxlint/linux-arm64-musl@npm:0.2.14": - version: 0.2.14 - resolution: "@oxlint/linux-arm64-musl@npm:0.2.14" +"@oxlint/linux-arm64-musl@npm:0.2.17": + version: 0.2.17 + resolution: "@oxlint/linux-arm64-musl@npm:0.2.17" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@oxlint/linux-x64-gnu@npm:0.2.14": - version: 0.2.14 - resolution: "@oxlint/linux-x64-gnu@npm:0.2.14" +"@oxlint/linux-x64-gnu@npm:0.2.17": + version: 0.2.17 + resolution: "@oxlint/linux-x64-gnu@npm:0.2.17" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@oxlint/linux-x64-musl@npm:0.2.14": - version: 0.2.14 - resolution: "@oxlint/linux-x64-musl@npm:0.2.14" +"@oxlint/linux-x64-musl@npm:0.2.17": + version: 0.2.17 + resolution: "@oxlint/linux-x64-musl@npm:0.2.17" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@oxlint/win32-arm64@npm:0.2.14": - version: 0.2.14 - resolution: "@oxlint/win32-arm64@npm:0.2.14" +"@oxlint/win32-arm64@npm:0.2.17": + version: 0.2.17 + resolution: "@oxlint/win32-arm64@npm:0.2.17" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@oxlint/win32-x64@npm:0.2.14": - version: 0.2.14 - resolution: "@oxlint/win32-x64@npm:0.2.14" +"@oxlint/win32-x64@npm:0.2.17": + version: 0.2.17 + resolution: "@oxlint/win32-x64@npm:0.2.17" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -29678,18 +29678,18 @@ __metadata: languageName: node linkType: hard -"oxlint@npm:0.2.14": - version: 0.2.14 - resolution: "oxlint@npm:0.2.14" +"oxlint@npm:0.2.17": + version: 0.2.17 + resolution: "oxlint@npm:0.2.17" dependencies: - "@oxlint/darwin-arm64": "npm:0.2.14" - "@oxlint/darwin-x64": "npm:0.2.14" - "@oxlint/linux-arm64-gnu": "npm:0.2.14" - "@oxlint/linux-arm64-musl": "npm:0.2.14" - "@oxlint/linux-x64-gnu": "npm:0.2.14" - "@oxlint/linux-x64-musl": "npm:0.2.14" - "@oxlint/win32-arm64": "npm:0.2.14" - "@oxlint/win32-x64": "npm:0.2.14" + "@oxlint/darwin-arm64": "npm:0.2.17" + "@oxlint/darwin-x64": "npm:0.2.17" + "@oxlint/linux-arm64-gnu": "npm:0.2.17" + "@oxlint/linux-arm64-musl": "npm:0.2.17" + "@oxlint/linux-x64-gnu": "npm:0.2.17" + "@oxlint/linux-x64-musl": "npm:0.2.17" + "@oxlint/win32-arm64": "npm:0.2.17" + "@oxlint/win32-x64": "npm:0.2.17" dependenciesMeta: "@oxlint/darwin-arm64": optional: true @@ -29709,7 +29709,7 @@ __metadata: optional: true bin: oxlint: bin/oxlint - checksum: 10/18c46a5adfa7477d6aa0be095fd913efd5b6701873f98d31d95f28817b7bb6590e1f1bc1b774dd4aa2166290c51482921a7ada7d86d0aaf16d9ab8d804dde8cf + checksum: 10/869e5a04d1059a88cef65c7533d953000fd183f4f186ff2ebf156390142100915cdebab343cb407451f8420972a6924e39359fbc403851e6cbc8e3cfbc1141e4 languageName: node linkType: hard