From 7da97643882ffec39738e909603fc561669ed50f Mon Sep 17 00:00:00 2001 From: Vasilii Mikhailovskii Date: Mon, 2 Dec 2024 10:38:45 +0200 Subject: [PATCH] fix ci/cd --- .gitea/workflows/deploy.yaml | 6 ++++-- .gitignore | 4 +++- package.json | 3 ++- packages/types/DBDocuments/MessageDocument.ts | 19 ++++++++++--------- packages/types/DBDocuments/Role.ts | 1 + .../DBDocuments/UserChatSettingsDocument.ts | 4 ++-- packages/types/DBDocuments/index.ts | 1 + packages/types/package.json | 8 ++++---- 8 files changed, 27 insertions(+), 19 deletions(-) create mode 100644 packages/types/DBDocuments/Role.ts diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 9acc2b7..ae24a64 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -22,6 +22,8 @@ jobs: node-version: '22' - name: Clean install dependencies and build run: | - npm ci - npm run build-only --workspace=apps/frontend -- --emptyOutDir --outDir /www/hereconnect.condev.ru/build-${{env.GITHUB_SHA}}/ + corepack enable + pnpm deploy --filter frontend --frozen-lockfile build/frontend + cd build/frontend + pnpm run build-only --emptyOutDir --outDir /www/hereconnect.condev.ru/build-${{env.GITHUB_SHA}}/ mv /www/hereconnect.condev.ru/current /www/hereconnect.condev.ru/old && mv /www/hereconnect.condev.ru/build-${{env.GITHUB_SHA}} /www/hereconnect.condev.ru/current && rm -rf /www/hereconnect.condev.ru/old diff --git a/.gitignore b/.gitignore index eb7eded..a04365a 100644 --- a/.gitignore +++ b/.gitignore @@ -21,4 +21,6 @@ node_modules *.sln *.sw? -/couchdb.env \ No newline at end of file +/couchdb.env + +build/ diff --git a/package.json b/package.json index 34731cd..4806010 100644 --- a/package.json +++ b/package.json @@ -5,8 +5,9 @@ "license": "@hereconnect/license", "engines": { "node": ">=v20.10.0", - "pnpm": ">=8.15.0" + "pnpm": ">=8.15.9" }, + "packageManager": "pnpm@8.15.9", "workspaces": { "packages": [ "apps/*", diff --git a/packages/types/DBDocuments/MessageDocument.ts b/packages/types/DBDocuments/MessageDocument.ts index b3e57a8..2ceff8b 100644 --- a/packages/types/DBDocuments/MessageDocument.ts +++ b/packages/types/DBDocuments/MessageDocument.ts @@ -1,4 +1,5 @@ -import { type BaseDocument } from './BaseDocument' +import { type BaseDocument } from "./BaseDocument"; +import type { Role } from "./Role"; /** * Интерфейс для документа сообщения. @@ -6,28 +7,28 @@ import { type BaseDocument } from './BaseDocument' */ export interface MessageDocument extends BaseDocument { /** Тип документа, всегда 'message' */ - type: 'message' + type: "message"; /** Идентификатор QR‑кода, к которому относится сообщение */ - qr_code_uri: string + qr_code_uri: string; /** Идентификатор чата для связывания сообщений */ - chat: string + chat: string; /** Отправитель сообщения ('guest' или 'owner') */ - from: 'guest' | 'owner' + from: Role; /** Содержимое сообщения */ - body: string + body: string; /** Опциональная геопозиция (широта и долгота) */ - location?: { lat: number; lng: number } + location?: { lat: number; lng: number }; /** Идентификатор пользователя, отправившего сообщение */ - user_uuid: string + user_uuid: string; /** Идентификатор браузера, отправившего сообщение */ - browser_uuid: string + browser_uuid: string; /** Вложения, такие как фото */ // _attachments?: { diff --git a/packages/types/DBDocuments/Role.ts b/packages/types/DBDocuments/Role.ts new file mode 100644 index 0000000..e2ec039 --- /dev/null +++ b/packages/types/DBDocuments/Role.ts @@ -0,0 +1 @@ +export type Role = "guest" | "owner"; diff --git a/packages/types/DBDocuments/UserChatSettingsDocument.ts b/packages/types/DBDocuments/UserChatSettingsDocument.ts index 0a7adf7..8fda318 100644 --- a/packages/types/DBDocuments/UserChatSettingsDocument.ts +++ b/packages/types/DBDocuments/UserChatSettingsDocument.ts @@ -1,5 +1,5 @@ import { type BaseDocument } from "./BaseDocument"; -import { MessageDocument } from "./MessageDocument"; +import type { Role } from "./Role"; /** * Интерфейс для документа настройки чата. @@ -15,7 +15,7 @@ export interface UserChatSettingsDocument extends BaseDocument { /** Идентификатор чата для связывания сообщений */ chat: string; - user_chat_role: MessageDocument["from"]; + user_chat_role: Role; /** Идентификатор пользователя, отправившего сообщение */ user_uuid: string; diff --git a/packages/types/DBDocuments/index.ts b/packages/types/DBDocuments/index.ts index ec7f8f3..1707caa 100644 --- a/packages/types/DBDocuments/index.ts +++ b/packages/types/DBDocuments/index.ts @@ -1,3 +1,4 @@ +export * from "./Role"; export * from "./BaseDocument"; export * from "./MessageDocument"; export * from "./PublicSettingsDocument"; diff --git a/packages/types/package.json b/packages/types/package.json index f7ee4d1..407f854 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -2,16 +2,16 @@ "name": "@hereconnect/types", "version": "1.0.0", "main": "index.ts", - "types": "./dist/index.d.ts", + "types": "index.ts", "exports": { ".": { - "import": "./dist/index.d.ts", - "default": "./dist/index.d.ts" + "import": "./index.ts", + "default": "./index.ts" } }, + "files": ["src/**/*"], "private": true, "scripts": { - "build": "tsc" }, "dependencies": { "typescript": "~5.6.3"