Skip to content

fix: align mta and package.json changes#3630

Open
longieirl wants to merge 26 commits intomainfrom
3399/resolve-merge-conflicts
Open

fix: align mta and package.json changes#3630
longieirl wants to merge 26 commits intomainfrom
3399/resolve-merge-conflicts

Conversation

@longieirl
Copy link
Copy Markdown
Contributor

@longieirl longieirl commented Sep 16, 2025 •
edited
Loading

Fix for #3399

  • Align UAA service during MTA generation
  • During MTA generation, the cds binary executes and generates CAP configuration files; additional attributes are added to package.json which were being lost during the final writing phase. A deep merge is now used to keep disk and in-memory package.json in sync (replacing the previous lodash-based approach.

@longieirl longieirl self-assigned this Sep 16, 2025
@changeset-bot
Copy link
Copy Markdown

changeset-bot bot commented Sep 16, 2025 •
edited
Loading

🦋 Changeset detected

Latest commit: c09182a

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 3 packages
Name Type
@sap-ux/cf-deploy-config-writer Patch
@sap-ux/cf-deploy-config-sub-generator Patch
@sap-ux/deploy-config-sub-generator Patch

Not sure what this means? Click here to learn what changesets are.

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

@longieirl longieirl requested a review from cianmSAP September 16, 2025 13:42
@longieirl longieirl force-pushed the 3399/resolve-merge-conflicts branch from ad099e3 to 7108f7d Compare October 3, 2025 10:40
@longieirl longieirl force-pushed the 3399/resolve-merge-conflicts branch from 9f5166f to 8c9ea35 Compare October 8, 2025 08:07
@longieirl longieirl force-pushed the 3399/resolve-merge-conflicts branch from 2cd0f6b to b6b0332 Compare November 12, 2025 16:01
@longieirl longieirl force-pushed the 3399/resolve-merge-conflicts branch from 8909091 to b6b0332 Compare November 20, 2025 14:23
@sonarqubecloud
Copy link
Copy Markdown

sonarqubecloud bot commented Dec 2, 2025

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
90.2% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

@sonarqubecloud
Copy link
Copy Markdown

sonarqubecloud bot commented Feb 4, 2026

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
90.2% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

@longieirl
Merge remote-tracking branch 'origin/main' into 3399/resolve-merge-co…
eac08eb 
…nflicts
@longieirl
chore(cf-deploy-config-writer): remove lodash dependency
2c757ed 
lodash was added to fix package.json merging during CAP MTA generation but
was superseded by PR #4040. Remove the runtime dep and its @types devDep.
@longieirl
Merge branch 'main' into 3399/resolve-merge-conflicts
7d14b65
cianmSAP
cianmSAP approved these changes Mar 27, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

@cianmSAP cianmSAP left a comment

Choose a reason for hiding this comment

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

Changes look good
Snapshots updated
Changeset present

@sonarqubecloud
Copy link
Copy Markdown

sonarqubecloud bot commented Mar 30, 2026

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

kjose90
kjose90 approved these changes Mar 30, 2026
View reviewed changes
Copy link
Copy Markdown
Member

@kjose90 kjose90 left a comment

Choose a reason for hiding this comment

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

Looks good
Changeset, snapshots ✅

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cianmSAP cianmSAP cianmSAP approved these changes

@kjose90 kjose90 kjose90 approved these changes

Assignees

@longieirl longieirl

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@longieirl @cianmSAP @kjose90