Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions oxlint.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"rules": {
"import/no-cycle": [
"error",
{
"ignoreTypes": true
}
]
}
}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/server/src/fundamentals/config/def.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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';
Expand Down
3 changes: 1 addition & 2 deletions packages/backend/server/src/fundamentals/config/env.ts
Original file line number Diff line number Diff line change
@@ -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
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/common/infra/src/page/page.ts
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion packages/common/infra/src/workspace/list/information.ts
Original file line number Diff line number Diff line change
@@ -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 '.';
Expand Down
76 changes: 38 additions & 38 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -29678,18 +29678,18 @@ __metadata:
languageName: node
linkType: hard

"oxlint@npm:0.2.14":
version: 0.2.14
resolution: "oxlint@npm:0.2.14"
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@npm:0.2.17":
version: 0.2.17
resolution: "oxlint@npm:0.2.17"
dependencies:
"@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
Expand All @@ -29709,7 +29709,7 @@ __metadata:
optional: true
bin:
oxlint: bin/oxlint
checksum: 10/18c46a5adfa7477d6aa0be095fd913efd5b6701873f98d31d95f28817b7bb6590e1f1bc1b774dd4aa2166290c51482921a7ada7d86d0aaf16d9ab8d804dde8cf
checksum: 10/869e5a04d1059a88cef65c7533d953000fd183f4f186ff2ebf156390142100915cdebab343cb407451f8420972a6924e39359fbc403851e6cbc8e3cfbc1141e4
languageName: node
linkType: hard

Expand Down