The minimalistic document archiving platform.
refactor(tasks): integrated cadence task services (#436)
Corentin Thomasset41a113334acc
diff --git a/apps/papra-server/package.json b/apps/papra-server/package.jsonindex cde12f5a..1eda5a8d 100644--- a/apps/papra-server/package.json+++ b/apps/papra-server/package.json@@ -33,6 +33,8 @@"@aws-sdk/client-s3": "^3.835.0","@aws-sdk/lib-storage": "^3.835.0","@azure/storage-blob": "^12.27.0",+ "@cadence-mq/core": "^0.1.0",+ "@cadence-mq/driver-memory": "^0.1.0","@corentinth/chisels": "^1.3.1","@corentinth/friendly-ids": "^0.0.1","@crowlog/async-context-plugin": "^1.2.1",diff --git a/apps/papra-server/src/index.ts b/apps/papra-server/src/index.tsindex a7aa1af6..2d492eee 100644--- a/apps/papra-server/src/index.ts+++ b/apps/papra-server/src/index.ts@@ -7,8 +7,8 @@ import { createServer } from './modules/app/server';import { parseConfig } from './modules/config/config';import { createIngestionFolderWatcher } from './modules/ingestion-folders/ingestion-folders.usecases';import { createLogger } from './modules/shared/logger/logger';-import { createTaskScheduler } from './modules/tasks/task-scheduler';-import { taskDefinitions } from './modules/tasks/tasks.defiitions';+import { registerTaskDefinitions } from './modules/tasks/tasks.definitions';+import { createTaskServices } from './modules/tasks/tasks.services';const logger = createLogger({ namespace: 'app-server' });@@ -17,8 +17,8 @@ const { config } = await parseConfig({ env });await ensureLocalDatabaseDirectoryExists({ config });const { db, client } = setupDatabase(config.database);-const { app } = await createServer({ config, db });-const { taskScheduler } = createTaskScheduler({ config, taskDefinitions, tasksArgs: { db } });+const taskServices = createTaskServices({ config });+const { app } = await createServer({ config, db, taskServices });const server = serve({@@ -37,11 +37,12 @@ if (config.ingestionFolder.isEnabled) {await startWatchingIngestionFolders();}-taskScheduler.start();+await registerTaskDefinitions({ taskServices, db, config });++taskServices.start();process.on('SIGINT', async () => {server.close();- taskScheduler.stop();client.close();process.exit(0);diff --git a/apps/papra-server/src/modules/app/server.ts b/apps/papra-server/src/modules/app/server.tsindex 5b79acb2..d53b8ebf 100644--- a/apps/papra-server/src/modules/app/server.ts+++ b/apps/papra-server/src/modules/app/server.ts@@ -6,6 +6,7 @@ import { parseConfig } from '../config/config';import { createEmailsServices } from '../emails/emails.services';import { createLoggerMiddleware } from '../shared/logger/logger.middleware';import { createSubscriptionsServices } from '../subscriptions/subscriptions.services';+import { createTaskServices } from '../tasks/tasks.services';import { createTrackingServices } from '../tracking/tracking.services';import { createAuthEmailsServices } from './auth/auth.emails.services';import { getAuth } from './auth/auth.services';@@ -23,6 +24,7 @@ async function createGlobalDependencies(partialDeps: Partial<GlobalDependencies>const trackingServices = createTrackingServices({ config });const auth = partialDeps.auth ?? getAuth({ db, config, authEmailsServices: createAuthEmailsServices({ emailsServices }), trackingServices }).auth;const subscriptionsServices = createSubscriptionsServices({ config });+ const taskServices = partialDeps.taskServices ?? createTaskServices({ config });return {config,@@ -31,6 +33,7 @@ async function createGlobalDependencies(partialDeps: Partial<GlobalDependencies>emailsServices,subscriptionsServices,trackingServices,+ taskServices,};}diff --git a/apps/papra-server/src/modules/app/server.types.ts b/apps/papra-server/src/modules/app/server.types.tsindex fa8b8870..7028a0d0 100644--- a/apps/papra-server/src/modules/app/server.types.ts+++ b/apps/papra-server/src/modules/app/server.types.ts@@ -3,6 +3,7 @@ import type { ApiKey } from '../api-keys/api-keys.types';import type { Config } from '../config/config.types';import type { EmailsServices } from '../emails/emails.services';import type { SubscriptionsServices } from '../subscriptions/subscriptions.services';+import type { TaskServices } from '../tasks/tasks.services';import type { TrackingServices } from '../tracking/tracking.services';import type { Auth } from './auth/auth.services';import type { Session } from './auth/auth.types';@@ -28,6 +29,7 @@ export type GlobalDependencies = {emailsServices: EmailsServices;subscriptionsServices: SubscriptionsServices;trackingServices: TrackingServices;+ taskServices: TaskServices;};export type RouteDefinitionContext = { app: ServerInstance } & GlobalDependencies;diff --git a/apps/papra-server/src/modules/documents/tasks/hard-delete-expired-documents.task.ts b/apps/papra-server/src/modules/documents/tasks/hard-delete-expired-documents.task.tsindex 6d216fcb..2e60d448 100644--- a/apps/papra-server/src/modules/documents/tasks/hard-delete-expired-documents.task.ts+++ b/apps/papra-server/src/modules/documents/tasks/hard-delete-expired-documents.task.ts@@ -1,24 +1,39 @@-import { defineTask } from '../../tasks/tasks.models';+import type { Database } from '../../app/database/database.types';+import type { Config } from '../../config/config.types';+import type { TaskServices } from '../../tasks/tasks.services';+import { createLogger } from '../../shared/logger/logger';import { createDocumentsRepository } from '../documents.repository';import { deleteExpiredDocuments } from '../documents.usecases';import { createDocumentStorageService } from '../storage/documents.storage.services';-export const hardDeleteExpiredDocumentsTaskDefinition = defineTask({- name: 'hard-delete-expired-documents',- isEnabled: ({ config }) => config.tasks.hardDeleteExpiredDocuments.enabled,- cronSchedule: ({ config }) => config.tasks.hardDeleteExpiredDocuments.cron,- runOnStartup: ({ config }) => config.tasks.hardDeleteExpiredDocuments.runOnStartup,- handler: async ({ db, config, now, logger }) => {- const documentsRepository = createDocumentsRepository({ db });- const documentsStorageService = await createDocumentStorageService({ config });+const logger = createLogger({ namespace: 'documents:tasks:hardDeleteExpiredDocuments' });- const { deletedDocumentsCount } = await deleteExpiredDocuments({- config,- documentsRepository,- documentsStorageService,- now,- });+export async function registerHardDeleteExpiredDocumentsTask({ taskServices, db, config }: { taskServices: TaskServices; db: Database; config: Config }) {+ const taskName = 'hard-delete-expired-documents';+ const { cron, runOnStartup } = config.tasks.hardDeleteExpiredDocuments;- logger.info({ deletedDocumentsCount }, 'Expired documents deleted');- },-});+ taskServices.registerTask({+ taskName,+ handler: async () => {+ const documentsRepository = createDocumentsRepository({ db });+ const documentsStorageService = await createDocumentStorageService({ config });++ const { deletedDocumentsCount } = await deleteExpiredDocuments({+ config,+ documentsRepository,+ documentsStorageService,+ });++ logger.info({ deletedDocumentsCount }, 'Expired documents deleted');+ },+ });++ await taskServices.schedulePeriodicJob({+ scheduleId: `periodic-${taskName}`,+ taskName,+ cron,+ immediate: runOnStartup,+ });++ logger.info({ taskName, cron, runOnStartup }, 'Hard delete expired documents task registered');+}diff --git a/apps/papra-server/src/modules/organizations/tasks/expire-invitations.task.ts b/apps/papra-server/src/modules/organizations/tasks/expire-invitations.task.tsindex 84ded6c9..84b7a50d 100644--- a/apps/papra-server/src/modules/organizations/tasks/expire-invitations.task.ts+++ b/apps/papra-server/src/modules/organizations/tasks/expire-invitations.task.ts@@ -1,14 +1,32 @@-import { defineTask } from '../../tasks/tasks.models';+import type { Database } from '../../app/database/database.types';+import type { Config } from '../../config/config.types';+import type { TaskServices } from '../../tasks/tasks.services';+import { createLogger } from '../../shared/logger/logger';import { createOrganizationsRepository } from '../organizations.repository';-export const expireInvitationsTaskDefinition = defineTask({- name: 'expire-invitations',- isEnabled: ({ config }) => config.tasks.expireInvitations.enabled,- cronSchedule: ({ config }) => config.tasks.expireInvitations.cron,- runOnStartup: ({ config }) => config.tasks.expireInvitations.runOnStartup,- handler: async ({ db, now }) => {- const organizationsRepository = createOrganizationsRepository({ db });-- await organizationsRepository.updateExpiredPendingInvitationsStatus({ now });- },-});+const logger = createLogger({ namespace: 'organizations:tasks:expireInvitations' });++export async function registerExpireInvitationsTask({ taskServices, db, config }: { taskServices: TaskServices; db: Database; config: Config }) {+ const taskName = 'expire-invitations';+ const { cron, runOnStartup } = config.tasks.expireInvitations;++ taskServices.registerTask({+ taskName,+ handler: async () => {+ const organizationsRepository = createOrganizationsRepository({ db });++ await organizationsRepository.updateExpiredPendingInvitationsStatus();++ logger.info('Updated expired pending invitations status');+ },+ });++ await taskServices.schedulePeriodicJob({+ scheduleId: `periodic-${taskName}`,+ taskName,+ cron,+ immediate: runOnStartup,+ });++ logger.info({ taskName, cron, runOnStartup }, 'Update expired pending invitations status task registered');+}diff --git a/apps/papra-server/src/modules/tasks/task-scheduler.ts b/apps/papra-server/src/modules/tasks/task-scheduler.tsdeleted file mode 100644index 01bd6e57..00000000--- a/apps/papra-server/src/modules/tasks/task-scheduler.ts+++ /dev/null@@ -1,66 +0,0 @@-import type { Database } from '../app/database/database.types';-import type { Config } from '../config/config.types';-import type { TaskDefinition } from './tasks.models';-import cron from 'node-cron';-import { createLogger, wrapWithLoggerContext } from '../shared/logger/logger';-import { generateId } from '../shared/random/ids';--export { createTaskScheduler };--const logger = createLogger({ namespace: 'tasks:scheduler' });--function createTaskScheduler({- config,- taskDefinitions,- tasksArgs,-}: {- config: Config;- taskDefinitions: TaskDefinition[];- tasksArgs: { db: Database };-}) {- const scheduledTasks = taskDefinitions.map((taskDefinition) => {- const isEnabled = taskDefinition.getIsEnabled({ config });- const cronSchedule = taskDefinition.getCronSchedule({ config });- const runOnStartup = taskDefinition.getRunOnStartup({ config });-- if (!isEnabled) {- return undefined;- }-- const task = cron.schedule(- cronSchedule,- async () => wrapWithLoggerContext(- {- taskId: generateId({ prefix: 'task' }),- taskName: taskDefinition.taskName,- },- async () => taskDefinition.run({ ...tasksArgs, config }),- ),- {- scheduled: false,- runOnInit: runOnStartup,- },- );-- return { job: task, taskName: taskDefinition.taskName };- }).filter(Boolean);-- return {- taskScheduler: {- scheduledTasks,- start() {- scheduledTasks.forEach(({ taskName, job }) => {- job.start();- logger.debug({ taskName }, 'Task scheduled');- });- },-- stop() {- scheduledTasks.forEach(({ taskName, job }) => {- job.stop();- logger.debug({ taskName }, 'Task unscheduled');- });- },- },- };-}diff --git a/apps/papra-server/src/modules/tasks/tasks.config.ts b/apps/papra-server/src/modules/tasks/tasks.config.tsindex 8ee5f7d2..fbf27b67 100644--- a/apps/papra-server/src/modules/tasks/tasks.config.ts+++ b/apps/papra-server/src/modules/tasks/tasks.config.ts@@ -3,6 +3,21 @@ import { z } from 'zod';import { booleanishSchema } from '../config/config.schemas';export const tasksConfig = {+ persistence: {+ driver: {+ doc: 'The driver to use for the tasks persistence',+ schema: z.enum(['memory']),+ default: 'memory',+ env: 'TASKS_PERSISTENCE_DRIVER',+ },+ },+ worker: {+ id: {+ doc: 'The id of the task worker, used to identify the worker in the Cadence cluster in case of multiple workers',+ schema: z.string().optional(),+ env: 'TASKS_WORKER_ID',+ },+ },hardDeleteExpiredDocuments: {enabled: {doc: 'Whether the task to hard delete expired "soft deleted" documents is enabled',diff --git a/apps/papra-server/src/modules/tasks/tasks.defiitions.ts b/apps/papra-server/src/modules/tasks/tasks.defiitions.tsdeleted file mode 100644index a68609b1..00000000--- a/apps/papra-server/src/modules/tasks/tasks.defiitions.ts+++ /dev/null@@ -1,7 +0,0 @@-import { hardDeleteExpiredDocumentsTaskDefinition } from '../documents/tasks/hard-delete-expired-documents.task';-import { expireInvitationsTaskDefinition } from '../organizations/tasks/expire-invitations.task';--export const taskDefinitions = [- hardDeleteExpiredDocumentsTaskDefinition,- expireInvitationsTaskDefinition,-];diff --git a/apps/papra-server/src/modules/tasks/tasks.definitions.ts b/apps/papra-server/src/modules/tasks/tasks.definitions.tsnew file mode 100644index 00000000..aa21b0ba--- /dev/null+++ b/apps/papra-server/src/modules/tasks/tasks.definitions.ts@@ -0,0 +1,10 @@+import type { Database } from '../app/database/database.types';+import type { Config } from '../config/config.types';+import type { TaskServices } from './tasks.services';+import { registerHardDeleteExpiredDocumentsTask } from '../documents/tasks/hard-delete-expired-documents.task';+import { registerExpireInvitationsTask } from '../organizations/tasks/expire-invitations.task';++export async function registerTaskDefinitions({ taskServices, db, config }: { taskServices: TaskServices; db: Database; config: Config }) {+ await registerHardDeleteExpiredDocumentsTask({ taskServices, db, config });+ await registerExpireInvitationsTask({ taskServices, db, config });+}diff --git a/apps/papra-server/src/modules/tasks/tasks.models.ts b/apps/papra-server/src/modules/tasks/tasks.models.tsdeleted file mode 100644index 9ca1035c..00000000--- a/apps/papra-server/src/modules/tasks/tasks.models.ts+++ /dev/null@@ -1,57 +0,0 @@-import type { Database } from '../app/database/database.types';-import type { Config } from '../config/config.types';-import type { Logger } from '../shared/logger/logger';-import { isFunction } from 'lodash-es';-import { createLogger } from '../shared/logger/logger';--export { defineTask };--export type TaskDefinition = ReturnType<typeof defineTask>;--function defineTask({- name: taskName,- cronSchedule,- isEnabled,- runOnStartup = false,- handler,- logger: taskLogger = createLogger({ namespace: `tasks:${taskName}` }),-}: {- name: string;- isEnabled: boolean | ((args: { config: Config }) => boolean);- cronSchedule: string | ((args: { config: Config }) => string);- runOnStartup?: boolean | ((args: { config: Config }) => boolean);- handler: (handlerArgs: { db: Database; config: Config; logger: Logger; now: Date }) => Promise<void>;- logger?: Logger;-}) {- const run = async ({- getNow = () => new Date(),- logger = taskLogger,- ...handlerArgs- }: {- db: Database;- config: Config;- getNow?: () => Date;- logger?: Logger;- }) => {- const startedAt = getNow();-- try {- logger.debug({ taskName, startedAt }, 'Task started');-- await handler({ ...handlerArgs, logger, now: getNow() });-- const durationMs = getNow().getTime() - startedAt.getTime();- logger.info({ taskName, durationMs, startedAt }, 'Task completed');- } catch (error) {- logger.error({ error, taskName, startedAt }, 'Task failed');- }- };-- return {- taskName,- run,- getIsEnabled: (args: { config: Config }) => (isFunction(isEnabled) ? isEnabled(args) : isEnabled),- getCronSchedule: (args: { config: Config }) => (isFunction(cronSchedule) ? cronSchedule(args) : cronSchedule),- getRunOnStartup: (args: { config: Config }) => (isFunction(runOnStartup) ? runOnStartup(args) : runOnStartup),- };-}diff --git a/apps/papra-server/src/modules/tasks/tasks.services.ts b/apps/papra-server/src/modules/tasks/tasks.services.tsnew file mode 100644index 00000000..0aed081f--- /dev/null+++ b/apps/papra-server/src/modules/tasks/tasks.services.ts@@ -0,0 +1,28 @@+import type { Config } from '../config/config.types';+import { createCadence } from '@cadence-mq/core';+import { createMemoryDriver } from '@cadence-mq/driver-memory';+import { createLogger } from '../shared/logger/logger';++export type TaskServices = ReturnType<typeof createTaskServices>;++const logger = createLogger({ namespace: 'tasks:services' });++export function createTaskServices({ config }: { config: Config }) {+ const workerId = config.tasks.worker.id ?? 'default';++ const driver = createMemoryDriver();+ const cadence = createCadence({ driver });++ return {+ ...cadence,+ start: () => {+ const worker = cadence.createWorker({ workerId });++ worker.start();++ logger.info({ workerId }, 'Task worker started');++ return worker;+ },+ };+}diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 2e92edb7..3e97c107 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -70,7 +70,7 @@ importers:version: 2.6.0unocss-preset-animations:specifier: ^1.2.1- version: 1.2.1([email protected]([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected])([email protected]))([email protected]([email protected])))+ version: 1.2.1([email protected]([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected])([email protected]))([email protected]([email protected])))yaml:specifier: ^2.8.0version: 2.8.0@@ -110,7 +110,7 @@ importers:version: 5.8.3unocss:specifier: 0.65.0-beta.2- version: 0.65.0-beta.2([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected])([email protected]))([email protected]([email protected]))+ version: 0.65.0-beta.2([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected])([email protected]))([email protected]([email protected]))apps/papra-client:dependencies:@@ -250,6 +250,12 @@ importers:'@azure/storage-blob':specifier: ^12.27.0version: 12.27.0+ '@cadence-mq/core':+ specifier: ^0.1.0+ version: 0.1.0+ '@cadence-mq/driver-memory':+ specifier: ^0.1.0+ version: 0.1.0(@cadence-mq/[email protected])'@corentinth/chisels':specifier: ^1.3.1version: 1.3.1@@ -1044,6 +1050,14 @@ packages:'@better-fetch/[email protected]':resolution: {integrity: sha512-rEFOE1MYIsBmoMJtQbl32PGHHXuG2hDxvEd7rUHE0vCBoFQVSDqaVs9hkZEtHCxRoY+CljXKFCOuJ8uxqw1LcA==}+ '@cadence-mq/[email protected]':+ resolution: {integrity: sha512-bJjYI3brZLQqV3kxz4/cQs2C1dhBL1j6PEt51nYNobSxsanyRNF7/u/Zdlcj0uMC2Pe0uepryrM78/N0r3s4ZQ==}++ '@cadence-mq/[email protected]':+ resolution: {integrity: sha512-wqG+4+bFrXNo0bCsdMtc0U6oxM8dWFG3nGRmKobwdTcnQ42z93Xcm7v1m3kxQibJAi5fjSrS0z6oTIkatorvAg==}+ peerDependencies:+ '@cadence-mq/core': ^0.1.0+'@capsizecss/[email protected]':resolution: {integrity: sha512-GrSU71meACqcmIUxPYOJvGKF0yryjN/L1aCuE9DViCTJI7bfkjgYDPD1zbNDcINJwSSP6UaBZY9GAbYDO7re0Q==}@@ -3265,6 +3279,9 @@ packages:'@stablelib/[email protected]':resolution: {integrity: sha512-1bnPQqSxSuc3Ii6MhBysoWCg58j97aUjuCSZrGSmDxNqtytIi0k8utUenAwTZN4V5mXXYGsVUI9zeBqy+jBOSQ==}+ '@standard-schema/[email protected]':+ resolution: {integrity: sha512-m2bOd0f2RT9k8QJx1JN85cZYyH1RqFBdlwtkSlf4tBDYLCiiZnv1fIIwacK6cqwXavOydf0NPToMQgpKq+dVlA==}+'@stylistic/[email protected]':resolution: {integrity: sha512-RnO1SaiCFHn666wNz2QfZEFxvmiNRqhzaMXHXxXXKt+MEP7aajlPxUSMIQpKAaJfverpovEYqjBOXDq6dDcaOQ==}engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}@@ -4281,6 +4298,10 @@ packages:resolution: {integrity: sha512-SJ4/EHwS36QMJd6h/Rg+GyR4A5xE0FSI3eZ+iBVpfqf1x0eTSg1smWLHrA+2jQThZSh97fmSgFSU8B61nxosxA==}+ resolution: {integrity: sha512-IS4mnFu6n3CFgEmXjr+B2zzGHsjJmHEdN+BViKvYSiEn3KWss9ICRDETDX/VZldiW82B94OyAZm4LIT4vcKK0g==}+ engines: {node: '>=18'}+resolution: {integrity: sha512-Q+xVJLoGOeIMXZmbUK4HYk+69cQH6LudR0Vu/pRm2YlU/hDV9CiS0gKUMaWY5f2NeUH9C1nV3bsTlCo0FsTV1Q==}@@ -5926,6 +5947,10 @@ packages:resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}+ resolution: {integrity: sha512-RkRWjA926cTvz5rAb1BqyWkKbbjzCGchDUIKMCUvNi17j6f6j8uHGDV82Aqcqtzd+icoYpELmG3ksgGiFNNcNg==}+ engines: {node: '>=12'}+resolution: {integrity: sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==}@@ -6276,11 +6301,6 @@ packages:resolution: {integrity: sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==}- resolution: {integrity: sha512-vSJJTG+t/dIKAUhUDw/dLdZ9s//5OxcHqLaDWWrW4Cdq7o6tdLIczUkMXt2MBNmk6sJRZBZRXVixs7URY1CmIg==}- engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}- hasBin: true-resolution: {integrity: sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==}engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}@@ -9375,6 +9395,17 @@ snapshots:'@better-fetch/[email protected]': {}+ '@cadence-mq/[email protected]':+ dependencies:+ '@corentinth/chisels': 1.3.1+ '@paralleldrive/cuid2': 2.2.2+ '@standard-schema/spec': 1.0.0+ cron-parser: 5.3.0++ '@cadence-mq/[email protected](@cadence-mq/[email protected])':+ dependencies:+ '@cadence-mq/core': 0.1.0+'@capsizecss/[email protected]':dependencies:blob-to-buffer: 1.2.9@@ -10250,8 +10281,8 @@ snapshots:hast-util-to-html: 9.0.5hast-util-to-text: 4.0.2hastscript: 9.0.1- postcss: 8.5.3- postcss-nested: 6.2.0([email protected])+ postcss: 8.5.6+ postcss-nested: 6.2.0([email protected])unist-util-visit: 5.0.0unist-util-visit-parents: 6.0.1@@ -11427,6 +11458,8 @@ snapshots:'@stablelib/[email protected]': {}+ '@standard-schema/[email protected]': {}+dependencies:@@ -11921,17 +11954,6 @@ snapshots:transitivePeerDependencies:- vue- '@unocss/[email protected]([email protected])':- dependencies:- '@unocss/config': 0.65.0-beta.2- '@unocss/core': 0.65.0-beta.2- '@unocss/rule-utils': 0.65.0-beta.2- css-tree: 3.1.0- postcss: 8.5.3- tinyglobby: 0.2.14- transitivePeerDependencies:- - supports-color-'@unocss/[email protected]([email protected])':dependencies:'@unocss/config': 0.65.0-beta.2@@ -12869,6 +12891,10 @@ snapshots:+ dependencies:+ luxon: 3.7.1+dependencies:node-fetch: 2.7.0@@ -13196,7 +13222,7 @@ snapshots:dependencies:'@types/estree-jsx': 1.0.5- acorn: 8.14.1+ acorn: 8.15.0esast-util-from-estree: 2.0.0vfile-message: 4.0.2@@ -13949,7 +13975,7 @@ snapshots:dependencies:- '@types/estree': 1.0.7+ '@types/estree': 1.0.8dependencies:@@ -14437,7 +14463,7 @@ snapshots:dependencies:- '@types/estree': 1.0.7+ '@types/estree': 1.0.8'@types/estree-jsx': 1.0.5'@types/hast': 3.0.4comma-separated-tokens: 2.0.3@@ -14957,6 +14983,8 @@ snapshots:dependencies:yallist: 3.1.1+ [email protected]: {}+dependencies:'@jridgewell/sourcemap-codec': 1.5.0@@ -15334,7 +15362,7 @@ snapshots:dependencies:- '@types/estree': 1.0.7+ '@types/estree': 1.0.8devlop: 1.1.0micromark-factory-mdx-expression: 2.0.3micromark-factory-space: 2.0.1@@ -15345,7 +15373,7 @@ snapshots:dependencies:- '@types/estree': 1.0.7+ '@types/estree': 1.0.8devlop: 1.1.0estree-util-is-identifier-name: 3.0.0micromark-factory-mdx-expression: 2.0.3@@ -15362,7 +15390,7 @@ snapshots:dependencies:- '@types/estree': 1.0.7+ '@types/estree': 1.0.8devlop: 1.1.0micromark-core-commonmark: 2.0.3micromark-util-character: 2.1.1@@ -15374,8 +15402,8 @@ snapshots:dependencies:- acorn: 8.14.1- acorn-jsx: 5.3.2([email protected])+ acorn: 8.15.0+ acorn-jsx: 5.3.2([email protected])micromark-extension-mdx-expression: 3.0.1micromark-extension-mdx-jsx: 3.0.2micromark-extension-mdx-md: 2.0.0@@ -15398,7 +15426,7 @@ snapshots:dependencies:- '@types/estree': 1.0.7+ '@types/estree': 1.0.8devlop: 1.1.0micromark-factory-space: 2.0.1micromark-util-character: 2.1.1@@ -15462,7 +15490,7 @@ snapshots:dependencies:- '@types/estree': 1.0.7+ '@types/estree': 1.0.8'@types/unist': 3.0.3devlop: 1.1.0estree-util-visit: 2.0.0@@ -15615,10 +15643,10 @@ snapshots:dependencies:- acorn: 8.14.1+ acorn: 8.15.0pathe: 2.0.3pkg-types: 1.3.1- ufo: 1.5.4+ ufo: 1.6.1@@ -15629,8 +15657,6 @@ snapshots:optional: true- [email protected]: {}-@@ -16007,9 +16033,9 @@ snapshots:postcss: 8.5.6postcss-selector-parser: 6.1.2dependencies:- postcss: 8.5.3+ postcss: 8.5.6postcss-selector-parser: 6.1.2@@ -16109,7 +16135,7 @@ snapshots:dependencies:- nanoid: 3.3.10+ nanoid: 3.3.11picocolors: 1.1.1source-map-js: 1.2.1@@ -16270,7 +16296,7 @@ snapshots:dependencies:- '@types/estree': 1.0.7+ '@types/estree': 1.0.8esast-util-from-js: 2.0.1unified: 11.0.5vfile: 6.0.3@@ -17244,20 +17270,20 @@ snapshots:- [email protected]([email protected]([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected])([email protected]))([email protected]([email protected]))):- dependencies:- unocss: 0.65.0-beta.2([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected])([email protected]))([email protected]([email protected]))-[email protected]([email protected]([email protected])([email protected])([email protected](@types/[email protected]))([email protected]([email protected]))):dependencies:unocss: 0.65.0-beta.2([email protected])([email protected])([email protected](@types/[email protected]))([email protected]([email protected]))- [email protected]([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected])([email protected]))([email protected]([email protected])):+ [email protected]([email protected]([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected])([email protected]))([email protected]([email protected]))):dependencies:- '@unocss/astro': 0.65.0-beta.2([email protected])([email protected](@types/[email protected])([email protected])([email protected])([email protected]))([email protected]([email protected]))+ unocss: 0.65.0-beta.2([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected])([email protected]))([email protected]([email protected]))++ [email protected]([email protected])([email protected])([email protected](@types/[email protected]))([email protected]([email protected])):+ dependencies:+ '@unocss/astro': 0.65.0-beta.2([email protected])([email protected](@types/[email protected]))([email protected]([email protected]))'@unocss/cli': 0.65.0-beta.2([email protected])'@unocss/core': 0.65.0-beta.2- '@unocss/postcss': 0.65.0-beta.2([email protected])+ '@unocss/postcss': 0.65.0-beta.2([email protected])'@unocss/preset-attributify': 0.65.0-beta.2'@unocss/preset-icons': 0.65.0-beta.2'@unocss/preset-mini': 0.65.0-beta.2@@ -17270,18 +17296,18 @@ snapshots:'@unocss/transformer-compile-class': 0.65.0-beta.2'@unocss/transformer-directives': 0.65.0-beta.2'@unocss/transformer-variant-group': 0.65.0-beta.2- '@unocss/vite': 0.65.0-beta.2([email protected])([email protected](@types/[email protected])([email protected])([email protected])([email protected]))([email protected]([email protected]))+ '@unocss/vite': 0.65.0-beta.2([email protected])([email protected](@types/[email protected]))([email protected]([email protected]))optionalDependencies:+ vite: 5.4.19(@types/[email protected])transitivePeerDependencies:- postcss- rollup- supports-color- vue- [email protected]([email protected])([email protected])([email protected](@types/[email protected]))([email protected]([email protected])):+ [email protected]([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected])([email protected]))([email protected]([email protected])):dependencies:- '@unocss/astro': 0.65.0-beta.2([email protected])([email protected](@types/[email protected]))([email protected]([email protected]))+ '@unocss/astro': 0.65.0-beta.2([email protected])([email protected](@types/[email protected])([email protected])([email protected])([email protected]))([email protected]([email protected]))'@unocss/cli': 0.65.0-beta.2([email protected])'@unocss/core': 0.65.0-beta.2'@unocss/postcss': 0.65.0-beta.2([email protected])@@ -17297,9 +17323,9 @@ snapshots:'@unocss/transformer-compile-class': 0.65.0-beta.2'@unocss/transformer-directives': 0.65.0-beta.2'@unocss/transformer-variant-group': 0.65.0-beta.2- '@unocss/vite': 0.65.0-beta.2([email protected])([email protected](@types/[email protected]))([email protected]([email protected]))+ '@unocss/vite': 0.65.0-beta.2([email protected])([email protected](@types/[email protected])([email protected])([email protected])([email protected]))([email protected]([email protected]))optionalDependencies:- vite: 5.4.19(@types/[email protected])transitivePeerDependencies:- postcss- rollup