Skip to content

Conversation

@taitsengstock
Copy link
Collaborator

@taitsengstock taitsengstock commented Dec 16, 2025

This PR resolves conflicts between upstream/main and staging

vercel bot and others added 18 commits December 11, 2025 16:45
Updated dependencies to fix Next.js and React CVE vulnerabilities.

The fix-react2shell-next tool automatically updated the following packages to their secure versions:
- next
- react-server-dom-webpack
- react-server-dom-parcel  
- react-server-dom-turbopack

All package.json files have been scanned and vulnerable versions have been patched to the correct fixed versions based on the official React advisory.

Co-authored-by: Vercel <vercel[bot]@users.noreply.github.com>
Updated dependencies to fix Next.js and React CVE vulnerabilities.

The fix-react2shell-next tool automatically updated the following packages to their secure versions:
- next
- react-server-dom-webpack
- react-server-dom-parcel  
- react-server-dom-turbopack

All package.json files have been scanned and vulnerable versions have been patched to the correct fixed versions based on the official React advisory.

Co-authored-by: Vercel <vercel[bot]@users.noreply.github.com>
* better connections dx

* better ux

* improvements

* fixes

* consistent dialogs

* fixes

* auto-select

* fixes

* fixes loop

* fixes

* fixes
* better actions

* robust new step
* ai gateway managed keys

* remove debugging

* stronger encryption

* fix new

* re-fetch teams

* simplify

* prefetch

* fix avatar

* better avatars

* fixes

* improvements

* fixes
- Remove sendgrid-integration-section component
- Change config values from string|boolean to string only
- Simplify SendGrid to always use KeeperHub API key
- Fix IntegrationWithConfig handling in integrations-manager
- Fix ai-gateway test function signature
- All TypeScript errors resolved
- Fix block statements (useBlockStatements)
- Remove unused imports and variables
- Auto-fix 3 files
- 2 complexity issues remain (manual refactor needed)
- Removed unused functions (getDialogTitle, getDialogDescription) from integration-form-dialog.tsx
- Removed unused state (loadingIntegration) from integrations-manager.tsx
- Added block statements to filter condition in integrations-manager.tsx
- Excluded upstream AI Gateway files from linting in biome.jsonc:
  - app/api/ai-gateway/
  - lib/ai-gateway/
  - components/workflow/config/action-grid.tsx

This maintains our custom code quality while avoiding conflicts with upstream code style.
@OleksandrUA OleksandrUA merged commit 4f3b78c into staging Dec 16, 2025
1 check passed
@OleksandrUA OleksandrUA deleted the fix/KEEP-1206-clean-merge-v2 branch December 16, 2025 13:33
taitsengstock pushed a commit that referenced this pull request Jan 14, 2026
Co-authored-by: Chris Tate <ctate@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants