Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: release merge back #817

Merged
merged 7 commits into from
Oct 11, 2024
Merged

fix: release merge back #817

merged 7 commits into from
Oct 11, 2024

Conversation

TCMeldrum
Copy link
Contributor

@TCMeldrum TCMeldrum commented Oct 11, 2024

Description

This PR introduces a fix for dependencies and package-lock files, ensuring that the project uses the correct versions and resolves from the appropriate registries.

Motivation and Context

This change is required to maintain consistency and correctness in our dependencies. It solves the problem of potential discrepancies and conflicts in package versions and their sources, which can lead to unexpected behavior or errors in the application.

Changes

  • Updated the license field in apps/backend/package-lock.json for the @isaacs/ttlcache dependency.
  • Modified the resolved field for ansi-styles and concurrently dependencies in yarn.lock to point to the npm registry.
  • Split the ansi-styles dependency into two entries in yarn.lock to accurately represent different resolved versions.

How Has This Been Tested?

Fixes Jira Issue

https://jira.esss.lu.se/browse/

Depends On

Tests included/Docs Updated?

  • I have added tests to cover my changes.
  • All relevant doc has been updated

@TCMeldrum TCMeldrum requested a review from a team as a code owner October 11, 2024 13:44
@TCMeldrum TCMeldrum requested review from Bhaswati1148 and removed request for a team October 11, 2024 13:44
@gnyiri
Copy link
Collaborator

gnyiri commented Oct 11, 2024

there is a conflict, i have the same conflict in my release->master PR. If you resolve this, I will update the PR with the up-to-date develop branch.

@TCMeldrum TCMeldrum changed the title fix: master merge back fix: release merge back Oct 11, 2024
@TCMeldrum
Copy link
Contributor Author

there is a conflict, i have the same conflict in my release->master PR. If you resolve this, I will update the PR with the up-to-date develop branch.

Hopefully have resolved them

@TCMeldrum TCMeldrum merged commit 8b6e603 into develop Oct 11, 2024
19 of 20 checks passed
@TCMeldrum TCMeldrum deleted the merge-back branch October 11, 2024 15:16
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