Skip to content

Commit f3cb105

Browse files
Merge remote-tracking branch 'origin/main' into copilot/clean-up-repo-extra-files
Conflicts: .eslintrc.json .gitignore Adam's_Hearty_Lentil_&_Vegetable_Soup.json Adam's_Ultimate_Vegan_Grilled_Cheese.json linuxarch101.md sample_sessiondata.json It looks like you may be committing a merge. If this is not correct, please run git update-ref -d MERGE_HEAD and try again. Please enter the commit message for your changes. Lines starting with '#' will be ignored, and an empty message aborts the commit. On branch copilot/clean-up-repo-extra-files Your branch is up to date with 'origin/copilot/clean-up-repo-extra-files'. ** All conflicts fixed but you are still merging.** Changes to be committed: modified: .agent/skills/dependency-auditor/test-project/package.json modified: .claude/skills/dependency-auditor/test-project/package.json modified: .codex/skills/dependency-auditor/test-project/package.json modified: .cursor/skills/dependency-auditor/test-project/package.json modified: .gemini/skills/dependency-auditor/test-project/package.json modified: .github/dependabot.yml modified: .github/skills/dependency-auditor/test-project/package.json modified: .github/workflows/ci.yml new file: .github/workflows/codeql-analysis.yml modified: .github/workflows/daily-repo-status.lock.yml modified: .github/workflows/dependabot-automerge.yml new file: .github/workflows/dependency-review.yml modified: .gitignore modified: .zed/skills/dependency-auditor/test-project/package.json modified: AGENTS.md modified: Backend modified: COPILOT.md modified: QUICK_REFERENCE.md modified: README.md modified: START_HERE.md modified: docs/cloud_build_tips.md   modified: docs/cloud_build_tipsFORMAT.md modified: metadata.json modified: package-lock.json modified: package.json modified: server/index.ts modified: src/app.component.html modified: src/app.component.ts modified: src/services/auth.service.ts modified: src/services/gemini.service.ts modified: src/services/persistence.service.ts modified: tsconfig.json Untracked files: .clawhub/ .eslintrc_BACKUP_1763037.json .eslintrc_BASE_1763037.json .eslintrc_LOCAL_1763037.json .eslintrc_REMOTE_1763037.json claude-code-tresor/ skills/ -- half way there,
2 parents 16d3d8f + 956fe70 commit f3cb105

32 files changed

Lines changed: 2336 additions & 1985 deletions

File tree

.agent/skills/dependency-auditor/test-project/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"express-rate-limit": "6.7.0",
2929
"multer": "2.1.1",
3030
"sharp": "0.32.6",
31-
"nodemailer": "7.0.11",
31+
"nodemailer": "8.0.4",
3232
"socket.io": "4.6.2",
3333
"redis": "4.6.5",
3434
"moment": "2.29.4",

.claude/skills/dependency-auditor/test-project/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"express-rate-limit": "6.7.0",
2929
"multer": "2.1.1",
3030
"sharp": "0.32.6",
31-
"nodemailer": "7.0.11",
31+
"nodemailer": "8.0.4",
3232
"socket.io": "4.6.2",
3333
"redis": "4.6.5",
3434
"moment": "2.29.4",

.codex/skills/dependency-auditor/test-project/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"express-rate-limit": "6.7.0",
2929
"multer": "2.1.1",
3030
"sharp": "0.32.6",
31-
"nodemailer": "7.0.11",
31+
"nodemailer": "8.0.4",
3232
"socket.io": "4.6.2",
3333
"redis": "4.6.5",
3434
"moment": "2.29.4",

.cursor/skills/dependency-auditor/test-project/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"express-rate-limit": "6.7.0",
2929
"multer": "2.1.1",
3030
"sharp": "0.32.6",
31-
"nodemailer": "7.0.11",
31+
"nodemailer": "8.0.4",
3232
"socket.io": "4.6.2",
3333
"redis": "4.6.5",
3434
"moment": "2.29.4",

.gemini/skills/dependency-auditor/test-project/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"express-rate-limit": "6.7.0",
2929
"multer": "2.1.1",
3030
"sharp": "0.32.6",
31-
"nodemailer": "7.0.11",
31+
"nodemailer": "8.0.4",
3232
"socket.io": "4.6.2",
3333
"redis": "4.6.5",
3434
"moment": "2.29.4",

.github/dependabot.yml

Lines changed: 50 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,14 @@ updates:
1212
labels:
1313
- "dependencies"
1414
- "github-actions"
15-
open-pull-requests-limit: 25
15+
commit-message:
16+
prefix: "ci"
17+
groups:
18+
# Group all GitHub Actions updates into a single PR
19+
actions-all:
20+
patterns:
21+
- "*"
22+
open-pull-requests-limit: 10
1623

1724
# -------------------------
1825
# npm (root)
@@ -25,7 +32,45 @@ updates:
2532
labels:
2633
- "dependencies"
2734
- "javascript"
28-
open-pull-requests-limit: 25
35+
commit-message:
36+
prefix: "build(deps)"
37+
groups:
38+
# All @angular/* packages should be updated together
39+
angular:
40+
patterns:
41+
- "@angular/*"
42+
# Testing tools (vitest, coverage)
43+
testing:
44+
patterns:
45+
- "vitest"
46+
- "@vitest/*"
47+
# ESLint and related plugins
48+
linting:
49+
patterns:
50+
- "eslint"
51+
- "eslint-*"
52+
- "@typescript-eslint/*"
53+
- "@angular-eslint/*"
54+
- "prettier"
55+
# TypeScript and type definitions
56+
types:
57+
patterns:
58+
- "typescript"
59+
- "@types/*"
60+
# Build tools (vite, tailwind, postcss, autoprefixer)
61+
build-tools:
62+
patterns:
63+
- "vite"
64+
- "tailwindcss"
65+
- "autoprefixer"
66+
- "postcss"
67+
# Ignore known breaking major updates that require manual migration
68+
ignore:
69+
# Tailwind v4 requires @tailwindcss/postcss plugin and full config migration.
70+
# Review periodically — remove this ignore when ready to migrate (see postcss.config.js).
71+
- dependency-name: "tailwindcss"
72+
update-types: ["version-update:semver-major"]
73+
open-pull-requests-limit: 15
2974

3075
# -------------------------
3176
# Docker (root)
@@ -38,4 +83,6 @@ updates:
3883
labels:
3984
- "dependencies"
4085
- "docker"
41-
open-pull-requests-limit: 25
86+
commit-message:
87+
prefix: "build(docker)"
88+
open-pull-requests-limit: 5

.github/skills/dependency-auditor/test-project/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"express-rate-limit": "6.7.0",
2929
"multer": "2.1.1",
3030
"sharp": "0.32.6",
31-
"nodemailer": "7.0.11",
31+
"nodemailer": "8.0.4",
3232
"socket.io": "4.6.2",
3333
"redis": "4.6.5",
3434
"moment": "2.29.4",

.github/workflows/ci.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,42 @@ on:
1010
branches: [main, develop]
1111

1212
jobs:
13+
format:
14+
name: Format and commit
15+
runs-on: ubuntu-latest
16+
# Only auto-commit on direct pushes — PRs from forks cannot push back
17+
if: github.event_name == 'push'
18+
permissions:
19+
contents: write
20+
21+
steps:
22+
- name: Checkout code
23+
uses: actions/checkout@v6
24+
with:
25+
token: ${{ secrets.GITHUB_TOKEN }}
26+
27+
- name: Setup Node.js
28+
uses: actions/setup-node@v6
29+
with:
30+
node-version: '20'
31+
cache: 'npm'
32+
33+
- name: Install dependencies
34+
run: npm ci
35+
36+
- name: Format with Prettier
37+
run: npm run format
38+
39+
- name: Commit formatted files
40+
run: |
41+
git config --local user.email "github-actions[bot]@users.noreply.github.com"
42+
git config --local user.name "github-actions[bot]"
43+
if ! git diff --quiet || ! git diff --staged --quiet; then
44+
git add -A
45+
git commit -m "style: auto-format with Prettier [skip ci]"
46+
git push
47+
fi
48+
1349
build:
1450
name: Build
1551
runs-on: ubuntu-latest
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
name: CodeQL
2+
3+
on:
4+
push:
5+
branches: [main]
6+
pull_request:
7+
branches: [main, develop]
8+
schedule:
9+
# Run weekly on Monday at 06:00 UTC to catch new CVEs
10+
- cron: "0 6 * * 1"
11+
12+
permissions:
13+
actions: read
14+
contents: read
15+
security-events: write
16+
17+
jobs:
18+
analyze:
19+
name: Analyze (${{ matrix.language }})
20+
runs-on: ubuntu-latest
21+
22+
strategy:
23+
fail-fast: false
24+
matrix:
25+
# JavaScript/TypeScript covers the Angular frontend and Express server.
26+
# Python (Flask backend) lives in the Backend/ submodule — a separate
27+
# repository that should configure its own CodeQL workflow.
28+
language: [javascript-typescript]
29+
30+
steps:
31+
- name: Checkout code
32+
uses: actions/checkout@v6
33+
34+
- name: Initialize CodeQL
35+
uses: github/codeql-action/init@v4
36+
with:
37+
languages: ${{ matrix.language }}
38+
# Use the extended security query suite for more comprehensive coverage
39+
queries: security-extended
40+
41+
- name: Autobuild
42+
uses: github/codeql-action/autobuild@v4
43+
44+
- name: Perform CodeQL Analysis
45+
uses: github/codeql-action/analyze@v4
46+
with:
47+
category: "/language:${{ matrix.language }}"

.github/workflows/daily-repo-status.lock.yml

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)