From 24df6221b323dc85d645e7c6d47517e2cd4520d3 Mon Sep 17 00:00:00 2001 From: Arswarog Date: Tue, 10 Nov 2026 16:55:11 +0300 Subject: [PATCH] it-smi --- .docuservix.yml | 4 - .gitea/workflows/ci.yaml | 36 +-- .gitea/workflows/production.yaml | 143 ---------- .specify/memory/constitution.md | 2 +- AGENTS.md | 4 +- README.md | 2 +- apps/api-e2e/package.json | 2 +- apps/api-e2e/tsconfig.json | 2 +- apps/api/deny-external-plugin.js | 2 +- apps/api/package.json | 2 +- apps/api/vitest.config.ts | 4 +- apps/api/webpack.base.js | 4 +- apps/web/package.json | 2 +- apps/web/src/app/app.spec.tsx | 2 +- apps/web/src/app/app.tsx | 2 +- apps/web/vite.config.ts | 2 +- docker-compose.production.yml | 55 ---- docker-compose.staging.yml | 10 +- docs/50-developing/01-api-layers.md | 167 ------------ docs/50-developing/02-web-layers.md | 224 ---------------- docs/50-developing/10-persistence.md | 99 ------- docs/50-developing/20-migrations.md | 131 --------- docs/50-developing/30-data-access.md | 188 ------------- docs/50-developing/40-testing.md | 31 --- docs/50-developing/_category_.yml | 1 - docs/55-logging/01-overview.md | 75 ------ docs/55-logging/02-using.md | 103 -------- docs/55-logging/03-auto-logging.md | 68 ----- docs/55-logging/04-manual-logs.md | 143 ---------- docs/55-logging/05-testing.md | 159 ----------- docs/55-logging/_category_.yml | 1 - docs/90-deploy/10-migrations.md | 380 --------------------------- docs/index.md | 56 ---- eslint.config.mjs | 2 +- project.json | 2 +- tsconfig.base.json | 6 +- 36 files changed, 27 insertions(+), 2089 deletions(-) delete mode 100644 .docuservix.yml delete mode 100644 .gitea/workflows/production.yaml delete mode 100644 docker-compose.production.yml delete mode 100644 docs/50-developing/01-api-layers.md delete mode 100644 docs/50-developing/02-web-layers.md delete mode 100644 docs/50-developing/10-persistence.md delete mode 100644 docs/50-developing/20-migrations.md delete mode 100644 docs/50-developing/30-data-access.md delete mode 100644 docs/50-developing/40-testing.md delete mode 100644 docs/50-developing/_category_.yml delete mode 100644 docs/55-logging/01-overview.md delete mode 100644 docs/55-logging/02-using.md delete mode 100644 docs/55-logging/03-auto-logging.md delete mode 100644 docs/55-logging/04-manual-logs.md delete mode 100644 docs/55-logging/05-testing.md delete mode 100644 docs/55-logging/_category_.yml delete mode 100644 docs/90-deploy/10-migrations.md delete mode 100644 docs/index.md diff --git a/.docuservix.yml b/.docuservix.yml deleted file mode 100644 index b8cb545..0000000 --- a/.docuservix.yml +++ /dev/null @@ -1,4 +0,0 @@ -title: 'GEO Helm' -project: - org: 'jt4d' - repo: 'jt4d' diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml index 25b89b9..1876625 100644 --- a/.gitea/workflows/ci.yaml +++ b/.gitea/workflows/ci.yaml @@ -32,15 +32,6 @@ jobs: - name: Check branch name run: yarn lint:branch-name - - name: Check branch name characters - env: - BRANCH: ${{ github.head_ref || github.ref_name }} - run: | - if ! printf '%s' "$BRANCH" | grep -Eq '^[A-Za-z0-9][A-Za-z0-9.-]*$'; then - echo "::error::Недопустимое имя ветки: '$BRANCH'. Разрешены только A-Z a-z 0-9 . -, имя не может быть пустым и начинаться с '-'" - exit 1 - fi - - name: Check migrations list run: yarn ts-node tools/buildDataSource.ts --check @@ -90,7 +81,7 @@ jobs: runs-on: ubuntu-latest needs: build env: - DEPLOY_URL: https://${{ github.head_ref || github.ref_name }}.jt4d.jt4d.ru.net + DEPLOY_URL: https://${{ github.head_ref || github.ref_name }}.it-smi.jt4d.ru.net steps: - name: Checkout uses: actions/checkout@v4 @@ -163,28 +154,3 @@ jobs: - name: Lint run: yarn lint:check - - docs: - name: Документация - runs-on: ubuntu-latest - needs: build - container: - image: git.jt4d.ru/jt4d/gitea-runner:latest - credentials: - username: ${{ vars.REGISTRY_USER }} - password: ${{ secrets.REGISTRY_PASSWORD }} - volumes: - - '/usr/local/share/.cache:/usr/local/share/.cache' - - env: - YARN_CACHE_FOLDER: /usr/local/share/.cache/yarn - - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Build and deploy docs - uses: https://git.jt4d.ru/docuservix/docs@next - with: - prefix: wiki - on-broken-links: warn diff --git a/.gitea/workflows/production.yaml b/.gitea/workflows/production.yaml deleted file mode 100644 index 7c72a8b..0000000 --- a/.gitea/workflows/production.yaml +++ /dev/null @@ -1,143 +0,0 @@ -name: Production - -on: - push: - tags: - - v* - workflow_dispatch: - inputs: - logLevel: - description: 'Log level' - required: true - default: 'info' - type: choice - options: - - verbose - - debug - - info - - warn - -concurrency: - group: production-deploy - cancel-in-progress: false - -jobs: - build: - name: Сборка - runs-on: ubuntu-latest - outputs: - version: ${{ steps.version.outputs.VERSION }} - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Login to Gitea Registry - uses: docker/login-action@v3 - with: - registry: git.jt4d.ru - username: ${{ vars.REGISTRY_USER }} - password: ${{ secrets.REGISTRY_PASSWORD }} - - - name: Compute version - id: version - env: - REF_NAME: ${{ github.ref_name }} - run: | - VERSION=$(git describe --tags --exact-match 2>/dev/null \ - || echo "$REF_NAME-$(git rev-parse --short HEAD)") - # Единственная проверка VERSION в пайплайне: дальше он уходит и в шаги - # этого job, и в deploy-production через needs.build.outputs.version. - if ! printf '%s' "$VERSION" | grep -Eq '^[A-Za-z0-9][A-Za-z0-9.-]*$'; then - echo "::error::Недопустимый VERSION: '$VERSION'. Разрешены только A-Z a-z 0-9 . -, значение не может быть пустым и начинаться с '-'" - exit 1 - fi - echo "VERSION=$VERSION" >> $GITHUB_OUTPUT - echo "**Версия:** \`$VERSION\`" >> $GITHUB_STEP_SUMMARY - - - name: Install dependencies - run: yarn install --frozen-lockfile - - - name: Check migrations list - run: yarn ts-node tools/buildDataSource.ts --check - - - name: Build - run: yarn build - env: - APP_VERSION: ${{ steps.version.outputs.VERSION }} - - - name: Check data-source - run: yarn ts-node tools/checkDataSource.ts - - - name: Build web docker image - uses: docker/build-push-action@v7 - with: - context: apps/web - file: apps/web/Dockerfile - push: true - tags: git.jt4d.ru/${{ github.repository }}/web:${{ steps.version.outputs.VERSION }} - cache-from: git.jt4d.ru/${{ github.repository }}/web:master - labels: | - org.opencontainers.image.ref.name=${{ steps.version.outputs.VERSION }} - - - name: Copy - run: cp yarn.lock apps/api/ - - - name: Build api docker image - uses: docker/build-push-action@v7 - with: - context: apps/api - file: apps/api/Dockerfile - push: true - tags: git.jt4d.ru/${{ github.repository }}/api:${{ steps.version.outputs.VERSION }} - cache-from: git.jt4d.ru/${{ github.repository }}/api:master - labels: | - org.opencontainers.image.ref.name=${{ steps.version.outputs.VERSION }} - - deploy-production: - name: Деплой на прод - runs-on: ubuntu-latest - needs: build - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Check log level - env: - LOG_LEVEL: ${{ inputs.logLevel }} - run: | - # VERSION проверен regexp-ом в job build (шаг Compute version) и приходит - # сюда как его output; LOG_LEVEL — свободный ввод, проверяется здесь. - case "$LOG_LEVEL" in - '' | verbose | debug | info | warn) ;; - *) - echo "::error::Недопустимый LOG_LEVEL: '$LOG_LEVEL'" - exit 1 - ;; - esac - - - name: Deploy via SSH - uses: jt4d-lab/ssh-action@v1 - env: - VERSION: ${{ needs.build.outputs.version }} - LOG_LEVEL: ${{ inputs.logLevel }} - with: - host: ${{ vars.PROD_HOST }} - username: ${{ vars.PROD_USER }} - key: ${{ secrets.PROD_SSH_PRIVATE_KEY }} - port: ${{ vars.PROD_PORT }} - workdir: /srv/jt4d - files: docker-compose.production.yml - envs: VERSION,LOG_LEVEL - script_stop: true - script: | - mv -f docker-compose.production.yml docker-compose.yml - - docker-compose pull --quiet - docker-compose down - docker-compose up -d - - # Ожидания готовности нет намеренно - echo "Список миграций" - docker exec jt4d_api node_modules/.bin/typeorm migration:show -d data-source.js - echo "Применение миграций" - docker exec jt4d_api node_modules/.bin/typeorm migration:run -t each -d data-source.js diff --git a/.specify/memory/constitution.md b/.specify/memory/constitution.md index 076bac1..967adc4 100644 --- a/.specify/memory/constitution.md +++ b/.specify/memory/constitution.md @@ -1,4 +1,4 @@ -# JT4D Constitution +# it-smi Constitution ## Core Principles diff --git a/AGENTS.md b/AGENTS.md index ec0d2c9..4ae1b15 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -97,8 +97,8 @@ yarn nx run api:db-migrations-list # Перегенерировать спис Определены в `tsconfig.base.json`: -- `@jt4d-platform/api/*` → `apps/api/src/*` -- `@jt4d-platform/web/*` → `apps/web/src/*` +- `@it-smi/api/*` → `apps/api/src/*` +- `@it-smi/web/*` → `apps/web/src/*` При переименовании воркспейса правятся и `paths`, и `customConditions`. diff --git a/README.md b/README.md index 99c76cf..8c1b33e 100644 --- a/README.md +++ b/README.md @@ -95,7 +95,7 @@ yarn nx affected -t # только по затронутым про ## Новый проект из шаблона -1. **Переименовать воркспейс.** `package.json` (`@jt4d-platform/*`), `project.json`, `nx.json`, +1. **Переименовать воркспейс.** `package.json` (`@it-smi/*`), `project.json`, `nx.json`, `tsconfig.base.json` (`paths` и `customConditions`), `apps/*/package.json`. 2. **Настроить доставку.** Домен и registry в `.gitea/workflows/*.yaml`, `docker-compose.production.yml`, `docker-compose.staging.yml`, `.docuservix.yml`; домен в diff --git a/apps/api-e2e/package.json b/apps/api-e2e/package.json index 1d1d90d..9ed8dd1 100644 --- a/apps/api-e2e/package.json +++ b/apps/api-e2e/package.json @@ -1,5 +1,5 @@ { - "name": "@jt4d-platform/api-e2e", + "name": "@it-smi/api-e2e", "version": "0.0.1", "private": true } diff --git a/apps/api-e2e/tsconfig.json b/apps/api-e2e/tsconfig.json index fd03f10..b9cc49f 100644 --- a/apps/api-e2e/tsconfig.json +++ b/apps/api-e2e/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { - "outDir": "out-tsc/@jt4d-platform/api-e2e", + "outDir": "out-tsc/@it-smi/api-e2e", "esModuleInterop": true, "noUnusedLocals": false, "noImplicitAny": false diff --git a/apps/api/deny-external-plugin.js b/apps/api/deny-external-plugin.js index 85705a2..532db08 100644 --- a/apps/api/deny-external-plugin.js +++ b/apps/api/deny-external-plugin.js @@ -16,7 +16,7 @@ const nodeExternals = require('webpack-node-externals'); */ module.exports.DenyExternalsPlugin = class DenyExternalsPlugin { constructor(skipExternalPackages) { - // Массив строк-префиксов, например ['@jt4d-platform/'] + // Массив строк-префиксов, например ['@it-smi/'] this.skipExternalPackages = skipExternalPackages; } diff --git a/apps/api/package.json b/apps/api/package.json index b018285..6de8fd2 100644 --- a/apps/api/package.json +++ b/apps/api/package.json @@ -1,5 +1,5 @@ { - "name": "@jt4d-platform/api", + "name": "@it-smi/api", "version": "0.0.1", "private": true, "dependencies": { diff --git a/apps/api/vitest.config.ts b/apps/api/vitest.config.ts index 2eac134..906fb7d 100644 --- a/apps/api/vitest.config.ts +++ b/apps/api/vitest.config.ts @@ -18,11 +18,11 @@ export default defineConfig({ ], resolve: { alias: { - '@jt4d-platform/api': resolve(import.meta.dirname, 'src'), + '@it-smi/api': resolve(import.meta.dirname, 'src'), }, }, test: { - name: '@jt4d-platform/api', + name: '@it-smi/api', globals: true, environment: 'node', include: ['src/**/*.{test,spec}.ts'], diff --git a/apps/api/webpack.base.js b/apps/api/webpack.base.js index b909b90..979d8fa 100644 --- a/apps/api/webpack.base.js +++ b/apps/api/webpack.base.js @@ -25,7 +25,7 @@ function createApiWebpackConfig({ output, nxPlugin, plugins = [] }) { }, resolve: { alias: { - '@jt4d-platform/api': join(__dirname, 'src'), + '@it-smi/api': join(__dirname, 'src'), }, extensions: ['.ts', '.tsx', '.js', '.jsx', '.json'], }, @@ -42,7 +42,7 @@ function createApiWebpackConfig({ output, nxPlugin, plugins = [] }) { // Обязательно в паре с externalDependencies: 'none'. Без плагина webpack // вкомпилирует второй экземпляр typeorm, и он перестанет быть тем же // модулем, что грузит CLI. - new DenyExternalsPlugin(['@jt4d-platform/']), + new DenyExternalsPlugin(['@it-smi/']), ...plugins, ], }; diff --git a/apps/web/package.json b/apps/web/package.json index 21be30c..0b28d4c 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -1,5 +1,5 @@ { - "name": "@jt4d-platform/web", + "name": "@it-smi/web", "version": "0.0.1", "private": true, "dependencies": { diff --git a/apps/web/src/app/app.spec.tsx b/apps/web/src/app/app.spec.tsx index a9dd312..460f65c 100644 --- a/apps/web/src/app/app.spec.tsx +++ b/apps/web/src/app/app.spec.tsx @@ -19,6 +19,6 @@ describe('App', () => { , ); - expect(getAllByText(/Hello @jt4d-platform\/web/i).length > 0).toBeTruthy(); + expect(getAllByText(/Hello @it-smi\/web/i).length > 0).toBeTruthy(); }); }); diff --git a/apps/web/src/app/app.tsx b/apps/web/src/app/app.tsx index cb953fd..4787f05 100644 --- a/apps/web/src/app/app.tsx +++ b/apps/web/src/app/app.tsx @@ -5,7 +5,7 @@ import { HealthPage } from '../pages/HealthPage'; export function App() { return (
-

Hello @jt4d-platform/web

+

Hello @it-smi/web