diff --git a/package.json b/package.json index 47b815d0f5..a49de1f566 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,7 @@ "lint-staged": "^15.2.2", "msw": "^2.3.0", "nx": "^19.0.0", - "oxlint": "0.9.6", + "oxlint": "0.9.10", "prettier": "^3.3.3", "semver": "^7.6.0", "serve": "^14.2.1", diff --git a/packages/backend/server/src/core/common/admin-guard.ts b/packages/backend/server/src/core/common/admin-guard.ts index 4ef95b8c6f..40949b2d2a 100644 --- a/packages/backend/server/src/core/common/admin-guard.ts +++ b/packages/backend/server/src/core/common/admin-guard.ts @@ -10,7 +10,7 @@ import { ActionForbidden, getRequestResponseFromContext, } from '../../fundamentals'; -import { FeatureManagementService } from '../features'; +import { FeatureManagementService } from '../features/management'; @Injectable() export class AdminGuard implements CanActivate, OnModuleInit { diff --git a/packages/frontend/core/src/components/affine/reference-link/index.tsx b/packages/frontend/core/src/components/affine/reference-link/index.tsx index 138d3dbeb2..cdeef62f04 100644 --- a/packages/frontend/core/src/components/affine/reference-link/index.tsx +++ b/packages/frontend/core/src/components/affine/reference-link/index.tsx @@ -1,9 +1,7 @@ import { useJournalInfoHelper } from '@affine/core/components/hooks/use-journal'; import { DocDisplayMetaService } from '@affine/core/modules/doc-display-meta'; -import { - PeekViewService, - useInsidePeekView, -} from '@affine/core/modules/peek-view'; +import { PeekViewService } from '@affine/core/modules/peek-view/services/peek-view'; +import { useInsidePeekView } from '@affine/core/modules/peek-view/view/modal-container'; import { WorkbenchLink } from '@affine/core/modules/workbench'; import { useI18n } from '@affine/i18n'; import { track } from '@affine/track'; diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-editor/lit-adaper.tsx b/packages/frontend/core/src/components/blocksuite/block-suite-editor/lit-adaper.tsx index 2d7d42bc02..30f148b2c9 100644 --- a/packages/frontend/core/src/components/blocksuite/block-suite-editor/lit-adaper.tsx +++ b/packages/frontend/core/src/components/blocksuite/block-suite-editor/lit-adaper.tsx @@ -7,7 +7,7 @@ import { useJournalInfoHelper } from '@affine/core/components/hooks/use-journal' import { EditorService } from '@affine/core/modules/editor'; import { EditorSettingService } from '@affine/core/modules/editor-settting'; import { toURLSearchParams } from '@affine/core/modules/navigation'; -import { PeekViewService } from '@affine/core/modules/peek-view'; +import { PeekViewService } from '@affine/core/modules/peek-view/services/peek-view'; import type { DocMode } from '@blocksuite/affine/blocks'; import { DocTitle, diff --git a/packages/frontend/core/src/components/hooks/affine/use-all-page-list-config.tsx b/packages/frontend/core/src/components/hooks/affine/use-all-page-list-config.tsx index 6941bfe614..73fc04de10 100644 --- a/packages/frontend/core/src/components/hooks/affine/use-all-page-list-config.tsx +++ b/packages/frontend/core/src/components/hooks/affine/use-all-page-list-config.tsx @@ -1,14 +1,24 @@ import { toast } from '@affine/component'; import { useBlockSuiteDocMeta } from '@affine/core/components/hooks/use-block-suite-page-meta'; -import type { AllPageListConfig } from '@affine/core/components/page-list'; -import { FavoriteTag } from '@affine/core/components/page-list'; +import { FavoriteTag } from '@affine/core/components/page-list/components/favorite-tag'; import { CompatibleFavoriteItemsAdapter } from '@affine/core/modules/properties'; import { ShareDocsListService } from '@affine/core/modules/share-doc'; import { PublicPageMode } from '@affine/graphql'; import { useI18n } from '@affine/i18n'; -import type { DocMeta } from '@blocksuite/affine/store'; +import type { DocCollection, DocMeta } from '@blocksuite/affine/store'; import { useLiveData, useService, WorkspaceService } from '@toeverything/infra'; -import { useCallback, useEffect, useMemo } from 'react'; +import { type ReactNode, useCallback, useEffect, useMemo } from 'react'; + +export type AllPageListConfig = { + allPages: DocMeta[]; + docCollection: DocCollection; + /** + * Return `undefined` if the page is not public + */ + getPublicMode: (id: string) => undefined | 'page' | 'edgeless'; + getPage: (id: string) => DocMeta | undefined; + favoriteRender: (page: DocMeta) => ReactNode; +}; /** * @deprecated very poor performance diff --git a/packages/frontend/core/src/components/page-list/view/edit-collection/edit-collection.tsx b/packages/frontend/core/src/components/page-list/view/edit-collection/edit-collection.tsx index f74bb9b5da..0ae50aff87 100644 --- a/packages/frontend/core/src/components/page-list/view/edit-collection/edit-collection.tsx +++ b/packages/frontend/core/src/components/page-list/view/edit-collection/edit-collection.tsx @@ -2,9 +2,7 @@ import { Button, Modal, RadioGroup } from '@affine/component'; import { useAllPageListConfig } from '@affine/core/components/hooks/affine/use-all-page-list-config'; import type { Collection } from '@affine/env/filter'; import { useI18n } from '@affine/i18n'; -import type { DocCollection, DocMeta } from '@blocksuite/affine/store'; import type { DialogContentProps } from '@radix-ui/react-dialog'; -import type { ReactNode } from 'react'; import { useCallback, useMemo, useState } from 'react'; import * as styles from './edit-collection.css'; @@ -188,14 +186,3 @@ export const EditCollection = ({ ); }; - -export type AllPageListConfig = { - allPages: DocMeta[]; - docCollection: DocCollection; - /** - * Return `undefined` if the page is not public - */ - getPublicMode: (id: string) => undefined | 'page' | 'edgeless'; - getPage: (id: string) => DocMeta | undefined; - favoriteRender: (page: DocMeta) => ReactNode; -}; diff --git a/packages/frontend/core/src/components/page-list/view/edit-collection/rules-mode.tsx b/packages/frontend/core/src/components/page-list/view/edit-collection/rules-mode.tsx index d64f05e717..9bcf2c30e3 100644 --- a/packages/frontend/core/src/components/page-list/view/edit-collection/rules-mode.tsx +++ b/packages/frontend/core/src/components/page-list/view/edit-collection/rules-mode.tsx @@ -15,12 +15,12 @@ import clsx from 'clsx'; import type { ReactNode } from 'react'; import { useCallback, useMemo, useState } from 'react'; +import type { AllPageListConfig } from '../../../hooks/affine/use-all-page-list-config'; import { FilterList } from '../../filter'; import { List, ListScrollContainer } from '../../list'; import type { ListItem } from '../../types'; import { filterPageByRules } from '../../use-collection-manager'; import { AffineShapeIcon } from '../affine-shape'; -import type { AllPageListConfig } from './edit-collection'; import * as styles from './edit-collection.css'; export const RulesMode = ({ diff --git a/packages/frontend/core/src/components/page-list/view/use-edit-collection.tsx b/packages/frontend/core/src/components/page-list/view/use-edit-collection.tsx index 8288ba63e2..893afa8bdf 100644 --- a/packages/frontend/core/src/components/page-list/view/use-edit-collection.tsx +++ b/packages/frontend/core/src/components/page-list/view/use-edit-collection.tsx @@ -3,8 +3,10 @@ import { useMount } from '@toeverything/infra'; import { useCallback, useEffect, useState } from 'react'; import { CreateCollectionModal } from './create-collection'; -import type { EditCollectionMode } from './edit-collection/edit-collection'; -import { EditCollectionModal } from './edit-collection/edit-collection'; +import { + EditCollectionModal, + type EditCollectionMode, +} from './edit-collection/edit-collection'; export const useEditCollection = () => { const [data, setData] = useState<{ diff --git a/tools/cli/src/webpack/cache-group.ts b/tools/cli/src/webpack/cache-group.ts index 7f9f028c80..1ec621cf74 100644 --- a/tools/cli/src/webpack/cache-group.ts +++ b/tools/cli/src/webpack/cache-group.ts @@ -68,7 +68,7 @@ export const productionCacheGroups = { name: 'styles', test: (module: any) => module.nameForCondition && - /\.css$/.test(module.nameForCondition()) && + module.nameForCondition()?.endsWith('.css') && !module.type.startsWith('javascript'), chunks: 'all' as const, minSize: 1, diff --git a/yarn.lock b/yarn.lock index 9441e87886..1da5837bfa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -621,7 +621,7 @@ __metadata: lint-staged: "npm:^15.2.2" msw: "npm:^2.3.0" nx: "npm:^19.0.0" - oxlint: "npm:0.9.6" + oxlint: "npm:0.9.10" prettier: "npm:^3.3.3" semver: "npm:^7.6.0" serve: "npm:^14.2.1" @@ -8916,58 +8916,58 @@ __metadata: languageName: node linkType: hard -"@oxlint/darwin-arm64@npm:0.9.6": - version: 0.9.6 - resolution: "@oxlint/darwin-arm64@npm:0.9.6" +"@oxlint/darwin-arm64@npm:0.9.10": + version: 0.9.10 + resolution: "@oxlint/darwin-arm64@npm:0.9.10" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@oxlint/darwin-x64@npm:0.9.6": - version: 0.9.6 - resolution: "@oxlint/darwin-x64@npm:0.9.6" +"@oxlint/darwin-x64@npm:0.9.10": + version: 0.9.10 + resolution: "@oxlint/darwin-x64@npm:0.9.10" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@oxlint/linux-arm64-gnu@npm:0.9.6": - version: 0.9.6 - resolution: "@oxlint/linux-arm64-gnu@npm:0.9.6" +"@oxlint/linux-arm64-gnu@npm:0.9.10": + version: 0.9.10 + resolution: "@oxlint/linux-arm64-gnu@npm:0.9.10" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@oxlint/linux-arm64-musl@npm:0.9.6": - version: 0.9.6 - resolution: "@oxlint/linux-arm64-musl@npm:0.9.6" +"@oxlint/linux-arm64-musl@npm:0.9.10": + version: 0.9.10 + resolution: "@oxlint/linux-arm64-musl@npm:0.9.10" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@oxlint/linux-x64-gnu@npm:0.9.6": - version: 0.9.6 - resolution: "@oxlint/linux-x64-gnu@npm:0.9.6" +"@oxlint/linux-x64-gnu@npm:0.9.10": + version: 0.9.10 + resolution: "@oxlint/linux-x64-gnu@npm:0.9.10" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@oxlint/linux-x64-musl@npm:0.9.6": - version: 0.9.6 - resolution: "@oxlint/linux-x64-musl@npm:0.9.6" +"@oxlint/linux-x64-musl@npm:0.9.10": + version: 0.9.10 + resolution: "@oxlint/linux-x64-musl@npm:0.9.10" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@oxlint/win32-arm64@npm:0.9.6": - version: 0.9.6 - resolution: "@oxlint/win32-arm64@npm:0.9.6" +"@oxlint/win32-arm64@npm:0.9.10": + version: 0.9.10 + resolution: "@oxlint/win32-arm64@npm:0.9.10" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@oxlint/win32-x64@npm:0.9.6": - version: 0.9.6 - resolution: "@oxlint/win32-x64@npm:0.9.6" +"@oxlint/win32-x64@npm:0.9.10": + version: 0.9.10 + resolution: "@oxlint/win32-x64@npm:0.9.10" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -26718,18 +26718,18 @@ __metadata: languageName: node linkType: hard -"oxlint@npm:0.9.6": - version: 0.9.6 - resolution: "oxlint@npm:0.9.6" +"oxlint@npm:0.9.10": + version: 0.9.10 + resolution: "oxlint@npm:0.9.10" dependencies: - "@oxlint/darwin-arm64": "npm:0.9.6" - "@oxlint/darwin-x64": "npm:0.9.6" - "@oxlint/linux-arm64-gnu": "npm:0.9.6" - "@oxlint/linux-arm64-musl": "npm:0.9.6" - "@oxlint/linux-x64-gnu": "npm:0.9.6" - "@oxlint/linux-x64-musl": "npm:0.9.6" - "@oxlint/win32-arm64": "npm:0.9.6" - "@oxlint/win32-x64": "npm:0.9.6" + "@oxlint/darwin-arm64": "npm:0.9.10" + "@oxlint/darwin-x64": "npm:0.9.10" + "@oxlint/linux-arm64-gnu": "npm:0.9.10" + "@oxlint/linux-arm64-musl": "npm:0.9.10" + "@oxlint/linux-x64-gnu": "npm:0.9.10" + "@oxlint/linux-x64-musl": "npm:0.9.10" + "@oxlint/win32-arm64": "npm:0.9.10" + "@oxlint/win32-x64": "npm:0.9.10" dependenciesMeta: "@oxlint/darwin-arm64": optional: true @@ -26748,8 +26748,9 @@ __metadata: "@oxlint/win32-x64": optional: true bin: + oxc_language_server: bin/oxc_language_server oxlint: bin/oxlint - checksum: 10/30bce9b6248f7c4dc4e5b1afb2ac02821336b2d59ddde015dd3905c8b645cfa4c43f8e86c337c9309ea0d7ea9b6ed4f8881352de8faa53a525c9eedd926e5cca + checksum: 10/feb4b3bda14e974c857a51dc09f2c0836390466a144d238cc4efb6fc1b3717111fa853b7c2016d4487cb26642d614ded0c1b96f21dab1d5815d2a5fef2938451 languageName: node linkType: hard