diff --git a/Dockerfile b/Dockerfile index f5d2ab8..567c9d8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,7 +46,7 @@ COPY barazo-plugins/packages/plugin-signatures/ ./barazo-plugins/packages/plugin COPY barazo-api/ ./barazo-api/ # Build workspace dependencies first, then API -RUN pnpm --filter @singi-labs/lexicons build && \ +RUN pnpm --filter @singi-labs/barazo-lexicons build && \ pnpm --filter @barazo/plugin-signatures run build:backend && \ pnpm --filter barazo-api build @@ -58,10 +58,10 @@ RUN pnpm --filter barazo-api deploy /app/deploy --prod # /workspace/, which won't exist in the runner stage. Fix each: # - lexicons: use pnpm deploy to get package + resolved dependencies # - plugin-signatures: only has peerDeps (satisfied by API), copy source directly -RUN pnpm --filter @singi-labs/lexicons deploy /tmp/lexicons-deploy --prod +RUN pnpm --filter @singi-labs/barazo-lexicons deploy /tmp/lexicons-deploy --prod -RUN rm -rf /app/deploy/node_modules/@singi-labs/lexicons \ - && cp -r /tmp/lexicons-deploy /app/deploy/node_modules/@singi-labs/lexicons \ +RUN rm -rf /app/deploy/node_modules/@singi-labs/barazo-lexicons \ + && cp -r /tmp/lexicons-deploy /app/deploy/node_modules/@singi-labs/barazo-lexicons \ && rm -rf /app/deploy/node_modules/@barazo/plugin-signatures \ && cp -r /workspace/barazo-plugins/packages/plugin-signatures /app/deploy/node_modules/@barazo/plugin-signatures diff --git a/package.json b/package.json index 3815926..b9ed913 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "@atproto/oauth-client-node": "0.3.17", "@atproto/tap": "0.2.7", "@barazo/plugin-signatures": "link:../barazo-plugins/packages/plugin-signatures", - "@singi-labs/lexicons": "link:../barazo-lexicons", + "@singi-labs/barazo-lexicons": "link:../barazo-lexicons", "@fastify/cookie": "11.0.2", "@fastify/cors": "11.2.0", "@fastify/helmet": "13.0.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fa25e3c..5df52c1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -81,7 +81,7 @@ importers: '@sentry/node': specifier: 10.41.0 version: 10.41.0 - '@singi-labs/lexicons': + '@singi-labs/barazo-lexicons': specifier: link:../barazo-lexicons version: link:../barazo-lexicons cborg: diff --git a/src/firehose/handlers/record.ts b/src/firehose/handlers/record.ts index 9f870b0..6a8ab8c 100644 --- a/src/firehose/handlers/record.ts +++ b/src/firehose/handlers/record.ts @@ -4,7 +4,7 @@ import type { TopicReplyInput, ReactionInput, VoteInput, -} from '@singi-labs/lexicons' +} from '@singi-labs/barazo-lexicons' import { users } from '../../db/schema/users.js' import { replies } from '../../db/schema/replies.js' import { reactions } from '../../db/schema/reactions.js' diff --git a/src/firehose/indexers/reaction.ts b/src/firehose/indexers/reaction.ts index ff9d8f2..97a3ff4 100644 --- a/src/firehose/indexers/reaction.ts +++ b/src/firehose/indexers/reaction.ts @@ -1,5 +1,5 @@ import { eq, sql } from 'drizzle-orm' -import type { ReactionInput } from '@singi-labs/lexicons' +import type { ReactionInput } from '@singi-labs/barazo-lexicons' import { reactions } from '../../db/schema/reactions.js' import { topics } from '../../db/schema/topics.js' import { replies } from '../../db/schema/replies.js' diff --git a/src/firehose/indexers/reply.ts b/src/firehose/indexers/reply.ts index b2046b8..4183982 100644 --- a/src/firehose/indexers/reply.ts +++ b/src/firehose/indexers/reply.ts @@ -1,5 +1,5 @@ import { eq, sql } from 'drizzle-orm' -import type { TopicReplyInput } from '@singi-labs/lexicons' +import type { TopicReplyInput } from '@singi-labs/barazo-lexicons' import { replies } from '../../db/schema/replies.js' import { topics } from '../../db/schema/topics.js' import type { Database } from '../../db/index.js' diff --git a/src/firehose/indexers/topic.ts b/src/firehose/indexers/topic.ts index 9b4fb80..0b707a6 100644 --- a/src/firehose/indexers/topic.ts +++ b/src/firehose/indexers/topic.ts @@ -1,5 +1,5 @@ import { eq } from 'drizzle-orm' -import type { TopicPostInput } from '@singi-labs/lexicons' +import type { TopicPostInput } from '@singi-labs/barazo-lexicons' import { topics } from '../../db/schema/topics.js' import type { Database } from '../../db/index.js' import type { Logger } from '../../lib/logger.js' diff --git a/src/firehose/indexers/vote.ts b/src/firehose/indexers/vote.ts index 026135b..f3104f8 100644 --- a/src/firehose/indexers/vote.ts +++ b/src/firehose/indexers/vote.ts @@ -1,5 +1,5 @@ import { eq, sql } from 'drizzle-orm' -import type { VoteInput } from '@singi-labs/lexicons' +import type { VoteInput } from '@singi-labs/barazo-lexicons' import { votes } from '../../db/schema/votes.js' import { topics } from '../../db/schema/topics.js' import { replies } from '../../db/schema/replies.js' diff --git a/src/firehose/types.ts b/src/firehose/types.ts index d5e50b0..1860670 100644 --- a/src/firehose/types.ts +++ b/src/firehose/types.ts @@ -1,4 +1,4 @@ -import type { LEXICON_IDS } from '@singi-labs/lexicons' +import type { LEXICON_IDS } from '@singi-labs/barazo-lexicons' /** Record actions from the firehose. */ export type RecordAction = 'create' | 'update' | 'delete' diff --git a/src/firehose/validation.ts b/src/firehose/validation.ts index a378735..e0c6e96 100644 --- a/src/firehose/validation.ts +++ b/src/firehose/validation.ts @@ -7,7 +7,7 @@ import { type TopicReplyInput, type ReactionInput, type VoteInput, -} from '@singi-labs/lexicons' +} from '@singi-labs/barazo-lexicons' import type { SupportedCollection } from './types.js' import { isSupportedCollection } from './types.js' diff --git a/src/validation/block-mute.ts b/src/validation/block-mute.ts index 2c2e330..b2c08dd 100644 --- a/src/validation/block-mute.ts +++ b/src/validation/block-mute.ts @@ -4,7 +4,7 @@ import { z } from 'zod/v4' // Param schemas for block/mute action endpoints // --------------------------------------------------------------------------- -// TODO: Import from @singi-labs/lexicons once didRegex export is published (see barazo-lexicons#44) +// TODO: Import from @singi-labs/barazo-lexicons once didRegex export is published (see barazo-lexicons#44) const didRegex = /^did:[a-z]+:[a-zA-Z0-9._:%-]+$/ /** Schema for validating :did route parameter. */