From 157d79932a0b109f7895a0e079a002984ac082c9 Mon Sep 17 00:00:00 2001 From: Arswarog Date: Tue, 27 Oct 2026 06:57:26 +0300 Subject: [PATCH] =?UTF-8?q?style:=20=D0=BF=D1=80=D0=B8=D0=B2=D0=B5=D1=81?= =?UTF-8?q?=D1=82=D0=B8=20=D0=B8=D0=BC=D0=BF=D0=BE=D1=80=D1=82=D1=8B=20?= =?UTF-8?q?=D0=B8=20=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=82=20=D0=BA=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=D0=B0=D0=BC=20=D0=BB=D0=B8=D0=BD?= =?UTF-8?q?=D1=82=D0=B5=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Порядок импортов в app.module, app.controller, typeorm.config и web-файлах, пустая строка перед комментарием в styles.css, prettier в .github/workflows/ci.yml. Каталог .agents исключён из prettier: это сгенерированные файлы Nx, они перезаписываются инструментом. --- .github/workflows/ci.yml | 58 +++++++++++++-------------- .prettierignore | 1 + apps/api/src/app/app.controller.ts | 1 + apps/api/src/app/app.module.ts | 1 + apps/api/src/config/typeorm.config.ts | 3 +- apps/web/src/app/app.tsx | 7 ++-- apps/web/src/app/nx-welcome.tsx | 50 ++++++++++++++++++----- apps/web/src/main.tsx | 4 +- apps/web/src/pages/HealthPage.tsx | 40 ++++++++++++++---- apps/web/src/styles.css | 1 + 10 files changed, 115 insertions(+), 51 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7ab067d..bbb061b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,40 +1,40 @@ name: CI on: - push: - branches: - - main - pull_request: + push: + branches: + - main + pull_request: permissions: - actions: read - contents: read + actions: read + contents: read jobs: - main: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v5 - with: - filter: tree:0 - fetch-depth: 0 + main: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v5 + with: + filter: tree:0 + fetch-depth: 0 - # This enables task distribution via Nx Cloud - # Run this command as early as possible, before dependencies are installed - # Learn more at https://nx.dev/docs/reference/nx-cloud-cli#npx-nxcloud-startcirun - - run: npx nx start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="e2e" + # This enables task distribution via Nx Cloud + # Run this command as early as possible, before dependencies are installed + # Learn more at https://nx.dev/docs/reference/nx-cloud-cli#npx-nxcloud-startcirun + - run: npx nx start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="e2e" - # Cache node_modules - - uses: actions/setup-node@v5 - with: - node-version: 24 - cache: 'npm' + # Cache node_modules + - uses: actions/setup-node@v5 + with: + node-version: 24 + cache: 'npm' - - run: npm ci + - run: npm ci - # Prepend any command with "nx record --" to record its logs to Nx Cloud - - run: npx nx record -- npx nx format:check --base="remotes/origin/main" - - run: npx nx run-many -t lint test build typecheck e2e - # Nx Cloud recommends fixes for failures to help you get CI green faster. Learn more: https://nx.dev/docs/features/ci-features/self-healing-ci - - run: npx nx fix-ci - if: always() + # Prepend any command with "nx record --" to record its logs to Nx Cloud + - run: npx nx record -- npx nx format:check --base="remotes/origin/main" + - run: npx nx run-many -t lint test build typecheck e2e + # Nx Cloud recommends fixes for failures to help you get CI green faster. Learn more: https://nx.dev/docs/features/ci-features/self-healing-ci + - run: npx nx fix-ci + if: always() diff --git a/.prettierignore b/.prettierignore index e299534..52f2304 100644 --- a/.prettierignore +++ b/.prettierignore @@ -5,3 +5,4 @@ /.nx/workspace-data .nx/self-healing /.claude +/.agents diff --git a/apps/api/src/app/app.controller.ts b/apps/api/src/app/app.controller.ts index f72a1c1..8f4b811 100644 --- a/apps/api/src/app/app.controller.ts +++ b/apps/api/src/app/app.controller.ts @@ -1,4 +1,5 @@ import { Controller, Get } from '@nestjs/common'; + import { AppService } from './app.service'; @Controller() diff --git a/apps/api/src/app/app.module.ts b/apps/api/src/app/app.module.ts index da156b4..22e614e 100644 --- a/apps/api/src/app/app.module.ts +++ b/apps/api/src/app/app.module.ts @@ -1,4 +1,5 @@ import { Module } from '@nestjs/common'; + import { AppController } from './app.controller'; import { AppService } from './app.service'; diff --git a/apps/api/src/config/typeorm.config.ts b/apps/api/src/config/typeorm.config.ts index 7cd920e..19da31c 100644 --- a/apps/api/src/config/typeorm.config.ts +++ b/apps/api/src/config/typeorm.config.ts @@ -1,5 +1,6 @@ -import { config } from 'dotenv'; import * as path from 'path'; + +import { config } from 'dotenv'; import { DataSource } from 'typeorm'; import { migrations } from '../database/migrations'; diff --git a/apps/web/src/app/app.tsx b/apps/web/src/app/app.tsx index c973de6..33942b1 100644 --- a/apps/web/src/app/app.tsx +++ b/apps/web/src/app/app.tsx @@ -1,6 +1,6 @@ -import NxWelcome from './nx-welcome'; +import { Link, Route, Routes } from 'react-router-dom'; -import { Route, Routes, Link } from 'react-router-dom'; +import NxWelcome from './nx-welcome'; export function App() { return ( @@ -28,7 +28,8 @@ export function App() { path="/" element={
- This is the generated root route. Click here for page 2. + This is the generated root route.{' '} + Click here for page 2.
} /> diff --git a/apps/web/src/app/nx-welcome.tsx b/apps/web/src/app/nx-welcome.tsx index 2726272..60559f5 100644 --- a/apps/web/src/app/nx-welcome.tsx +++ b/apps/web/src/app/nx-welcome.tsx @@ -436,7 +436,10 @@ export function NxWelcome({ title }: { title: string }) { -
+