Skip to content

Upmerge to edge#2500

Merged
DariuszPorowski merged 11 commits intoedgefrom
upmerge/manual-2026-02-27
Feb 27, 2026
Merged

Upmerge to edge#2500
DariuszPorowski merged 11 commits intoedgefrom
upmerge/manual-2026-02-27

Conversation

@DariuszPorowski
Copy link
Member

Manual upmerge from v0.54 to edge

rad-ci-bot and others added 8 commits December 9, 2025 23:04
Signed-off-by: Radius CI Bot <radiuscoreteam@service.microsoft.com>
Bumps [qs](https://github.com/ljharb/qs) from 6.14.0 to 6.14.1.
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](ljharb/qs@v6.14.0...v6.14.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [react-router](https://github.com/remix-run/react-router/tree/HEAD/packages/react-router) and [react-router-dom](https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom). These dependencies needed to be updated together.

Updates `react-router` from 7.10.1 to 7.12.0
- [Release notes](https://github.com/remix-run/react-router/releases)
- [Changelog](https://github.com/remix-run/react-router/blob/main/packages/react-router/CHANGELOG.md)
- [Commits](https://github.com/remix-run/react-router/commits/react-router@7.12.0/packages/react-router)

Updates `react-router-dom` from 7.10.1 to 7.12.0
- [Release notes](https://github.com/remix-run/react-router/releases)
- [Changelog](https://github.com/remix-run/react-router/blob/main/packages/react-router-dom/CHANGELOG.md)
- [Commits](https://github.com/remix-run/react-router/commits/react-router-dom@7.12.0/packages/react-router-dom)

---
updated-dependencies:
- dependency-name: react-router
  dependency-version: 7.12.0
  dependency-type: direct:production
- dependency-name: react-router-dom
  dependency-version: 7.12.0
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [diff](https://github.com/kpdecker/jsdiff) from 4.0.2 to 4.0.4.
- [Changelog](https://github.com/kpdecker/jsdiff/blob/master/release-notes.md)
- [Commits](kpdecker/jsdiff@v4.0.2...v4.0.4)

---
updated-dependencies:
- dependency-name: diff
  dependency-version: 4.0.4
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
#2484)

* Initial plan

* Fix Dockerfile build failure by switching to python:3-alpine base image

Replace alpine:3.14 with python:3-alpine to avoid the distutils-installed
'packaging' conflict that prevents pip from upgrading packages. The official
Python image includes pip without distutils conflicts, eliminating the error:
"Cannot uninstall 'packaging'. It is a distutils installed project."

Co-authored-by: brooke-hamilton <45323234+brooke-hamilton@users.noreply.github.com>

* Pin Python base image to python:3.12-alpine for reproducible builds

Co-authored-by: brooke-hamilton <45323234+brooke-hamilton@users.noreply.github.com>

* Update samples/volumes/Dockerfile

Co-authored-by: Dariusz Porowski <3431813+DariuszPorowski@users.noreply.github.com>
Signed-off-by: Brooke Hamilton <45323234+brooke-hamilton@users.noreply.github.com>

---------

Signed-off-by: Brooke Hamilton <45323234+brooke-hamilton@users.noreply.github.com>
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: brooke-hamilton <45323234+brooke-hamilton@users.noreply.github.com>
Co-authored-by: Dariusz Porowski <3431813+DariuszPorowski@users.noreply.github.com>
Signed-off-by: Nell Shamrell <nellshamrell@gmail.com>
Co-authored-by: Brooke Hamilton <45323234+brooke-hamilton@users.noreply.github.com>
Bumps  and [minimatch](https://github.com/isaacs/minimatch). These dependencies needed to be updated together.

Updates `minimatch` from 3.1.2 to 3.1.4
- [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md)
- [Commits](isaacs/minimatch@v3.1.2...v3.1.4)

Updates `minimatch` from 10.1.1 to 10.2.3
- [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md)
- [Commits](isaacs/minimatch@v3.1.2...v3.1.4)

---
updated-dependencies:
- dependency-name: minimatch
  dependency-version: 3.1.4
  dependency-type: indirect
- dependency-name: minimatch
  dependency-version: 10.2.3
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…02-27

Signed-off-by: Dariusz Porowski <3431813+DariuszPorowski@users.noreply.github.com>
@DariuszPorowski DariuszPorowski requested review from a team as code owners February 27, 2026 21:45
…error reporting

Signed-off-by: Dariusz Porowski <3431813+DariuszPorowski@users.noreply.github.com>
Signed-off-by: Dariusz Porowski <3431813+DariuszPorowski@users.noreply.github.com>
@DariuszPorowski
Copy link
Member Author

I reproduced the failing job Build and push sample images to GHCR (samples/demo/, samples/demo) locally with docker build.

Root cause: samples/demo/client/package-lock.json was corrupted during manual conflict resolution, so npm ci in samples/demo/client failed with EUSAGE (lockfile invalid/missing semantics).

Fix pushed in commit c9e87ab on this PR:

  • Regenerated samples/demo/client/package-lock.json (npm install --package-lock-only)
  • Verified locally:
    • npm ci in samples/demo
    • npm ci in samples/demo/client
    • docker build -t samples-demo-debug samples/demo

@DariuszPorowski DariuszPorowski merged commit e2ee623 into edge Feb 27, 2026
11 checks passed
@DariuszPorowski DariuszPorowski deleted the upmerge/manual-2026-02-27 branch February 27, 2026 22:15
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.

5 participants