Skip to content

Main to Develop sync after dependabot fixes#1667

Merged
subodhr258 merged 3 commits into
developfrom
main
Feb 24, 2026
Merged

Main to Develop sync after dependabot fixes#1667
subodhr258 merged 3 commits into
developfrom
main

Conversation

@subodhr258
Copy link
Copy Markdown
Collaborator

No description provided.

dependabot Bot and others added 3 commits February 19, 2026 20:17
Bumps [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) from 9.6.23 to 9.6.33.
- [Release notes](https://github.com/sebastianbergmann/phpunit/releases)
- [Changelog](https://github.com/sebastianbergmann/phpunit/blob/9.6.33/ChangeLog-9.6.md)
- [Commits](sebastianbergmann/phpunit@9.6.23...9.6.33)

---
updated-dependencies:
- dependency-name: phpunit/phpunit
  dependency-version: 9.6.33
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [axios](https://github.com/axios/axios) from 1.13.4 to 1.13.5.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](axios/axios@v1.13.4...v1.13.5)

---
updated-dependencies:
- dependency-name: axios
  dependency-version: 1.13.5
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps-dev): bump qs from 6.14.1 to 6.14.2

Bumps [qs](https://github.com/ljharb/qs) from 6.14.1 to 6.14.2.
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](ljharb/qs@v6.14.1...v6.14.2)

---
updated-dependencies:
- dependency-name: qs
  dependency-version: 6.14.2
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* Fix BrowserStack Local vulnerablity (https://github.com/rtCamp/godam/security/dependabot/101)

- BrowserStack Local is vulnerable to Command Injection through logfile variable
- Fixed it by updating the jquery-ui-draggable version from 1.14.1 to 1.14.2

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR syncs dependency updates from main to develop, primarily reflecting Dependabot-driven bumps across npm, Composer, and a vendored jQuery UI bundle used by the media library UI.

Changes:

  • Bump axios to ^1.13.5 and update package-lock.json accordingly.
  • Replace the vendored jQuery UI draggable bundle from 1.14.1 to 1.14.2 and update the media-library import path.
  • Update composer.lock with newer dev/transitive packages (notably including PHP 8.4-only constraints).

Reviewed changes

Copilot reviewed 11 out of 31 changed files in this pull request and generated no comments.

Show a summary per file
File Description
package.json Bumps axios version range.
package-lock.json Locks axios and related transitive dependency updates.
composer.lock Updates Composer-locked dependencies (currently resolving to PHP 8.4+ packages).
assets/src/js/media-library/index.js Updates import to vendored jQuery UI 1.14.2 bundle.
.distignore Updates ignored vendored jQuery UI path.
assets/src/libs/jquery-ui-1.14.2.draggable/package.json Adds/updates vendored jQuery UI package metadata for 1.14.2.
assets/src/libs/jquery-ui-1.14.2.draggable/jquery-ui.theme.min.css Updates vendored jQuery UI theme minified CSS header/version.
assets/src/libs/jquery-ui-1.14.2.draggable/jquery-ui.theme.css Updates vendored jQuery UI theme CSS header/version.
assets/src/libs/jquery-ui-1.14.2.draggable/jquery-ui.structure.min.css Updates vendored jQuery UI structure minified CSS header/version.
assets/src/libs/jquery-ui-1.14.2.draggable/jquery-ui.structure.css Updates vendored jQuery UI structure CSS header/version.
assets/src/libs/jquery-ui-1.14.2.draggable/jquery-ui.min.js Adds vendored jQuery UI 1.14.2 minified JS bundle.
assets/src/libs/jquery-ui-1.14.2.draggable/jquery-ui.min.css Updates vendored jQuery UI minified CSS header/version.
assets/src/libs/jquery-ui-1.14.2.draggable/jquery-ui.js Updates vendored jQuery UI unminified JS bundle version markers.
assets/src/libs/jquery-ui-1.14.2.draggable/jquery-ui.css Updates vendored jQuery UI CSS header/version.
assets/src/libs/jquery-ui-1.14.2.draggable/index.html Adds vendored jQuery UI demo page content.
assets/src/libs/jquery-ui-1.14.2.draggable/images/ui-icons_ffffff_256x240.png Adds/updates vendored jQuery UI theme icon sprite.
assets/src/libs/jquery-ui-1.14.2.draggable/images/ui-icons_cc0000_256x240.png Adds/updates vendored jQuery UI theme icon sprite.
assets/src/libs/jquery-ui-1.14.2.draggable/images/ui-icons_777777_256x240.png Adds/updates vendored jQuery UI theme icon sprite.
assets/src/libs/jquery-ui-1.14.2.draggable/images/ui-icons_777620_256x240.png Adds/updates vendored jQuery UI theme icon sprite.
assets/src/libs/jquery-ui-1.14.2.draggable/images/ui-icons_555555_256x240.png Adds/updates vendored jQuery UI theme icon sprite.
assets/src/libs/jquery-ui-1.14.2.draggable/images/ui-icons_444444_256x240.png Adds/updates vendored jQuery UI theme icon sprite.
assets/src/libs/jquery-ui-1.14.2.draggable/LICENSE.txt Adds vendored jQuery UI license text.
assets/src/libs/jquery-ui-1.14.2.draggable/AUTHORS.txt Adds vendored jQuery UI authors list.
assets/src/libs/jquery-ui-1.14.1.draggable/jquery-ui.min.js Removes the previous vendored jQuery UI 1.14.1 minified JS bundle.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@KMchaudhary
Copy link
Copy Markdown
Collaborator

LGTM - please verify the godam media library DAM interface once, if its functionaing properly
Mainly drag and drop functionality

@subodhr258 subodhr258 merged commit 12804f2 into develop Feb 24, 2026
11 of 13 checks passed
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