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 conflicting npm dependencies and bump typescript 4 to 5 : Fixes #1182 #1224

Merged
merged 3 commits into from
Feb 2, 2024

Conversation

shivarm
Copy link
Member

@shivarm shivarm commented Jan 31, 2024

Fixes Issue #1182

Changes proposed

Check List (Check all the applicable boxes)

  • My code follows the code style of this project.
  • My change requires changes to the documentation.
  • I have updated the documentation accordingly.
  • All new and existing tests passed.

Sorry, something went wrong.

@shivarm shivarm self-assigned this Jan 31, 2024
@shivarm shivarm requested a review from johnaohara January 31, 2024 12:09
@shivarm shivarm requested a review from johnaohara January 31, 2024 14:28
@shivarm shivarm force-pushed the fix-npm-conflict branch 5 times, most recently from 0a755d1 to 788eb94 Compare February 1, 2024 12:33

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
@shivarm
Copy link
Member Author

shivarm commented Feb 1, 2024

@johnaohara let's merge it

@johnaohara
Copy link
Member

@johnaohara let's merge it

@shivam-sharma7 , I am really sorry, I merged in another PR before this and there is a conflict with package-lock.json again

I am going to fix the package-lock.json issue and mere.

We seem to have a problem with some PR's that the entire package-lock.json is re-written with a different number of spaces, which means the entire file is replaced

@johnaohara johnaohara merged commit 488c433 into Hyperfoil:master Feb 2, 2024
2 checks passed
johnaohara added a commit that referenced this pull request Feb 2, 2024
* Fix conflicting npm dependencies and bump typescript 4 to 5

* Fix package-lock.json format

---------

Co-authored-by: John O'Hara <[email protected]>
@johnaohara
Copy link
Member

Merged, Thanks for your contribution.

@shivarm shivarm deleted the fix-npm-conflict branch February 3, 2024 03:45
@johnaohara johnaohara changed the title Fix conflicting npm dependencies and bump typescript 4 to 5 Fix conflicting npm dependencies and bump typescript 4 to 5 : Fixes #1182 Feb 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants