Fix security vulnerabilities in dependency overrides and resolve merge conflicts#602
Open
ConnorQi01 wants to merge 5 commits into
Open
Fix security vulnerabilities in dependency overrides and resolve merge conflicts#602ConnorQi01 wants to merge 5 commits into
ConnorQi01 wants to merge 5 commits into
Conversation
Contributor
Author
|
@copilot resolve the merge conflicts in this pull request |
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
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Addresses two open Dependabot security alerts by updating dependency overrides and resolves the PR's merge conflicts with the latest
masterdependency changes.Proposed Changes
js-yamloverride from^4.1.1to^4.2.0(Dependabot alert Updating require usages in cordova-plugin-device-motion simulation. #113, medium severity — quadratic-complexity DoS)@babel/coreoverride^7.29.7(Dependabot alert XHR proxying omits static properties #111, low severity — arbitrary file read via sourceMappingURL)serialize-javascriptandtmpsecurity overrides during conflict resolutionserialize-javascriptto7.0.5to avoid unintended version drift while keeping the merged lockfile aligned with the upstream secure versionTest Plan
node_modules/js-yamlresolves to4.2.0✓node_modules/@babel/coreresolves to7.29.7✓node_modules/serialize-javascriptresolves to7.0.5✓npm test✓npm run eslint✓ (pre-existing warnings only)