Skip to content

CEXT-6573: back-sync release hotfix to main - #641

Merged
iivvaannxx merged 3 commits into
mainfrom
back-sync/release-hotfix
Aug 19, 2026
Merged

CEXT-6573: back-sync release hotfix to main#641
iivvaannxx merged 3 commits into
mainfrom
back-sync/release-hotfix

Conversation

@iivvaannxx

@iivvaannxx iivvaannxx commented Aug 19, 2026

Copy link
Copy Markdown
Collaborator

Description

  • Merge release into main after the CEXT-6573 hotfix release.
  • Preserve the current main manifest structure while applying only the released package versions.
  • Preserve release ancestry so future back-syncs recognize the release commits.

Related Issue

Motivation and Context

The automated back-sync conflicted because main reformatted the package manifests while release independently updated their versions. This merge resolves the nine manifests semantically without releasing the unreleased work already on main.

How Has This Been Tested?

  • pnpm install
  • pnpm format:check
  • pnpm typecheck
  • pnpm --filter @aio-commerce-sdk/scripting-utils --filter @adobe/aio-commerce-lib-app --filter @adobe/aio-commerce-lib-admin-ui test
  • Confirmed origin/release is an ancestor of the merge commit.
  • Confirmed the resolved manifests differ from main only by the released versions.

Screenshots (if appropriate):

Not applicable.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • I have signed the Adobe Open Source CLA.
  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have read the DEVELOPMENT document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

iivvaannxx and others added 3 commits August 19, 2026 13:27
@iivvaannxx
CEXT-6573: ship production React build for Admin UI SDK apps (gate St…
71bf666 
…rictMode to development) (#635)

* set NODE_ENV in app build hooks and gate StrictMode to dev builds

* cover setNodeEnv in hook tests and update StrictMode usage docs

* test pre-app-build/dev/run hooks against the real .env; sync admin-ui skill doc

* thread injectable cwd through hooks instead of INIT_CWD; align dev/run exec error handling

* chore(temp): increate timeout temporarily of failing tests

* resolve .env from project root so env hooks work from any subdirectory

* changeset: lib-app patch (no public API change)
@github-actions
ci: release packages (#640)
6b69060 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@iivvaannxx
ci: sync versioning changes from release
2373738 
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@changeset-bot

changeset-bot Bot commented Aug 19, 2026

Copy link
Copy Markdown

⚠️ No Changeset found

Latest commit: 2373738

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@github-actions github-actions Bot added pkg: aio-commerce-sdk Includes changes in `packages/aio-commerce-sdk` pkg: aio-commerce-lib-auth Includes changes to `packages/aio-commerce-lib-auth` without-changeset The PR does not contain a Changeset file pkg: aio-commerce-lib-core Includes changes in `packages/aio-commerce-lib-core` pkg: aio-commerce-lib-api Includes changes to `packages-private/aio-commerce-lib-api` pkg: aio-commerce-lib-events Includes changes in `packages/aio-commerce-lib-events` pkg: aio-commerce-lib-config Includes changes in `packages/aio-commerce-lib-config` pkg: aio-commerce-lib-app Includes changes in `packages/aio-commerce-lib-app` private-pkg: scripting-utils Includes changes to `packages-private/scripting-utils` private-pkg: common-utils Includes changes in `packages-private/common-utils` pkg: aio-commerce-lib-admin-ui pkg: aio-commerce-lib-webhooks plugin: aio-commerce-plugin-app-management labels Aug 19, 2026
@iivvaannxx

iivvaannxx commented Aug 19, 2026

Copy link
Copy Markdown
Collaborator Author

Going cowboy on approvals here since this should be merged ASAP to keep main and release in sync. The commit would have come from CI anyway, but needed conflict resolution

@iivvaannxx
iivvaannxx merged commit d17dbcc into main Aug 19, 2026
5 checks passed
@iivvaannxx
iivvaannxx deleted the back-sync/release-hotfix branch August 19, 2026 13:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

pkg: aio-commerce-lib-admin-ui pkg: aio-commerce-lib-api Includes changes to `packages-private/aio-commerce-lib-api` pkg: aio-commerce-lib-app Includes changes in `packages/aio-commerce-lib-app` pkg: aio-commerce-lib-auth Includes changes to `packages/aio-commerce-lib-auth` pkg: aio-commerce-lib-config Includes changes in `packages/aio-commerce-lib-config` pkg: aio-commerce-lib-core Includes changes in `packages/aio-commerce-lib-core` pkg: aio-commerce-lib-events Includes changes in `packages/aio-commerce-lib-events` pkg: aio-commerce-lib-webhooks pkg: aio-commerce-sdk Includes changes in `packages/aio-commerce-sdk` plugin: aio-commerce-plugin-app-management private-pkg: common-utils Includes changes in `packages-private/common-utils` private-pkg: scripting-utils Includes changes to `packages-private/scripting-utils` without-changeset The PR does not contain a Changeset file

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@iivvaannxx