Skip to content

Commit 0e924c1

Browse files
Copilotgalshubeli
andauthored
chore: merge staging into fix/dependabot-security-alerts to resolve conflicts
- Resolved package-lock.json conflict by taking staging's version (staging already has lodash-es 4.18.1 without needing root overrides) - Removed redundant root package.json overrides for lodash-es - Retained all security fixes: litellm~=1.83.0, fastmcp>=3.2.0, aiohttp>=3.13.4 - Updated fastmcp import path (already resolved in staging) Co-authored-by: galshubeli <124919062+galshubeli@users.noreply.github.com>
2 parents da53e66 + bdc533f commit 0e924c1

9 files changed

Lines changed: 3492 additions & 4585 deletions

File tree

.github/wordlist.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,4 +117,5 @@ PRs
117117
pylint
118118
pytest
119119
Radix
120-
Zod
120+
Zod
121+
Dependabot

.github/workflows/playwright.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ env:
1919

2020
jobs:
2121
test:
22+
# Skip for Dependabot PRs — the LLM-dependent E2E tests require Azure OpenAI
23+
# secrets that are not available in Dependabot PR runs. Full E2E coverage runs
24+
# on the merge-to-staging/main push event where secrets are accessible.
25+
if: github.event_name != 'pull_request' || github.event.pull_request.user.login != 'dependabot[bot]'
2226
timeout-minutes: 60
2327
runs-on: ubuntu-latest
2428

AGENTS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ See `.env.example` for the full list.
135135

136136
GitHub Actions workflows (`.github/workflows/`):
137137
- **tests.yml** — unit tests + lint on push/PR to main/staging
138-
- **playwright.yml** — dedicated Playwright E2E suite
138+
- **playwright.yml** — dedicated Playwright E2E suite (skipped for Dependabot PRs; secrets unavailable)
139139
- **pylint.yml** — Python linting
140140
- **spellcheck.yml** — docs spellcheck
141141
- **publish-docker.yml** — build & push Docker image to DockerHub

app/package-lock.json

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

app/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"preview": "vite preview"
1212
},
1313
"dependencies": {
14-
"@falkordb/canvas": "^0.0.44",
14+
"@falkordb/canvas": "^0.0.45",
1515
"@hookform/resolvers": "^5.2.2",
1616
"@radix-ui/react-accordion": "^1.2.11",
1717
"@radix-ui/react-alert-dialog": "^1.1.14",
@@ -57,7 +57,7 @@
5757
"react-dom": "^18.3.1",
5858
"react-hook-form": "^7.71.2",
5959
"react-resizable-panels": "^2.1.9",
60-
"react-router-dom": "^7.13.1",
60+
"react-router-dom": "^7.13.2",
6161
"recharts": "^2.15.4",
6262
"sonner": "^1.7.4",
6363
"tailwind-merge": "^2.6.0",

0 commit comments

Comments
 (0)