Skip to content

Fix security vulnerabilities in dependency overrides and resolve merge conflicts#602

Open
ConnorQi01 wants to merge 5 commits into
masterfrom
dev/v-peq/security-fix-2026-04-22
Open

Fix security vulnerabilities in dependency overrides and resolve merge conflicts#602
ConnorQi01 wants to merge 5 commits into
masterfrom
dev/v-peq/security-fix-2026-04-22

Conversation

@ConnorQi01

@ConnorQi01 ConnorQi01 commented Jun 24, 2026

Copy link
Copy Markdown
Contributor

Summary

Addresses two open Dependabot security alerts by updating dependency overrides and resolves the PR's merge conflicts with the latest master dependency changes.

Proposed Changes

  • Bump js-yaml override from ^4.1.1 to ^4.2.0 (Dependabot alert Updating require usages in cordova-plugin-device-motion simulation. #113, medium severity — quadratic-complexity DoS)
  • Add @babel/core override ^7.29.7 (Dependabot alert XHR proxying omits static properties #111, low severity — arbitrary file read via sourceMappingURL)
  • Preserve the upstream serialize-javascript and tmp security overrides during conflict resolution
  • Pin serialize-javascript to 7.0.5 to avoid unintended version drift while keeping the merged lockfile aligned with the upstream secure version

Test Plan

  • node_modules/js-yaml resolves to 4.2.0
  • node_modules/@babel/core resolves to 7.29.7
  • node_modules/serialize-javascript resolves to 7.0.5
  • npm test
  • npm run eslint ✓ (pre-existing warnings only)

@ConnorQi01 ConnorQi01 added dependencies Pull requests that update a dependency file security labels Jun 24, 2026
@ConnorQi01

Copy link
Copy Markdown
Contributor Author

@copilot resolve the merge conflicts in this pull request

Copilot AI commented Jun 24, 2026

Copy link
Copy Markdown

@copilot resolve the merge conflicts in this pull request

Resolved in 14ff7d3. The branch now merges cleanly with master, and I kept the merged dependency overrides aligned with the upstream security changes.

Copilot AI changed the title Fix security vulnerability: bump js-yaml to 4.2.0 and add @babel/core override to 7.29.7 Fix security vulnerabilities in dependency overrides and resolve merge conflicts Jun 24, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dependencies Pull requests that update a dependency file security

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants