Skip to content

Commit 0046160

Browse files
committed
chore: resolve merge conflicts with origin/main
- tsconfig.json: use main's ES2022 target with decorators support - jest.config.js: merge both test roots (src/__tests__ and tests/) - package.json: union of both dependency sets - src/index.ts: keep auth/admin routes + add redis health/metrics endpoints from main - package-lock.json: regenerated after dependency merge
2 parents 5e796e4 + c65830a commit 0046160

174 files changed

Lines changed: 26070 additions & 4026 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.env.example

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Copy this file to .env and fill in values.
2+
# .env is gitignored — never commit secrets.
3+
4+
# ── Redis ─────────────────────────────────────────────────────────────────────
5+
REDIS_HOST=127.0.0.1
6+
REDIS_PORT=6379
7+
# Minimum 32 random characters in production
8+
REDIS_PASSWORD=devpassword
9+
# Set to "true" and configure TLS certs for production managed Redis
10+
REDIS_TLS=false
11+
12+
# ── Application ───────────────────────────────────────────────────────────────
13+
NODE_ENV=development
14+
PORT=3000

.github/workflows/ci.yml

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,32 @@ jobs:
5454
defaults:
5555
run:
5656
working-directory: backend
57+
58+
services:
59+
redis:
60+
image: redis:7-alpine
61+
ports:
62+
- 6379:6379
63+
options: >-
64+
--health-cmd "redis-cli ping"
65+
--health-interval 5s
66+
--health-timeout 3s
67+
--health-retries 5
68+
--health-start-period 5s
69+
70+
env:
71+
REDIS_HOST: 127.0.0.1
72+
REDIS_PORT: 6379
73+
NODE_ENV: test
74+
5775
steps:
5876
- uses: actions/checkout@v4
5977

6078
- uses: actions/setup-node@v4
6179
with:
6280
node-version: 22
63-
cache: npm
64-
cache-dependency-path: backend/package-lock.json
6581

66-
- run: npm ci
82+
- run: npm install
6783
- run: npm run lint
6884
- run: npm run build
6985
- run: npm test

.gitignore

Lines changed: 49 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,53 @@
1+
# Rust / Cargo
2+
target/
3+
Cargo.lock
4+
*.d
5+
6+
# WASM build artifacts
7+
*.wasm
8+
!contracts/*/wasm/*.wasm
9+
*.wasm.sha256
10+
11+
# Node / JS
112
node_modules/
213
dist/
14+
build/
315
.next/
4-
target/
5-
*.wasm.sha256
16+
.cache/
17+
*.tsbuildinfo
18+
pnpm-lock.yaml
19+
package-lock.json
20+
21+
# Env / secrets
622
.env
7-
.env.local
23+
.env.*
24+
!.env.example
25+
26+
# Editor
27+
.vscode/
28+
.idea/
29+
*.swp
30+
*.swo
31+
*.orig
32+
33+
# OS
34+
.DS_Store
35+
.DS_Store?
36+
._*
37+
Thumbs.db
38+
39+
# Kiro
40+
.kiro/
41+
42+
# Test artifacts
43+
**/test_snapshots/
44+
proptest-regressions/
45+
46+
# Logs
47+
*.log
48+
npm-debug.log*
49+
yarn-debug.log*
50+
51+
# Misc
52+
*.bak
53+
*.tmp

.kiro/specs/delegate-authorization/.config.kiro

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)