cli-microsoft365 icon indicating copy to clipboard operation
cli-microsoft365 copied to clipboard

Updates dependencies

Open garrytrinder opened this issue 3 years ago • 1 comments

After merging this PR npm outdated will return...

image

As per comments on the previous months update PR #3504, the following dependencies have been updated to ESM which will require further changes to upgrade to the latest major versions.

garrytrinder avatar Aug 03 '22 15:08 garrytrinder

@garrytrinder rechecked locally on win. all fine ✅ let me know if you want to merge this on your own or you want me to do it 👍

Adam-it avatar Aug 03 '22 21:08 Adam-it

Feel free to merge @Adam-it 👍

garrytrinder avatar Aug 17 '22 00:08 garrytrinder

Feel free to merge @Adam-it 👍

I was afraid you will say that 😅. I will merge it in my next open source time.. I hope sometime over the weekend 🤔. Assigning this to me then 👍

Adam-it avatar Aug 18 '22 23:08 Adam-it

@garrytrinder , @waldekmastykarz before I do anything stupid just to double check. As this was not created on forked repo but on this current but still we should not just merge but rebase in order to have clean history right ? also after that I will need to do git push with --force right ?

Adam-it avatar Aug 20 '22 22:08 Adam-it

When you rebase, you shouldn't need to force push because the PR branch will be updated with commits from main. Happy to help with merging it if needed.

For the future, let's create working branches for PRs in forked repos.

waldekmastykarz avatar Aug 21 '22 15:08 waldekmastykarz

When you rebase, you shouldn't need to force push because the PR branch will be updated with commits from main. Happy to help with merging it if needed.

For the future, let's create working branches for PRs in forked repos.

Hmm strange, I thought I had it aligned 🤔. Ok I will give it a check. If something goes wrong and I won't feel 100% sure about it maybe we could do it together really quick during a call 😉

Adam-it avatar Aug 21 '22 16:08 Adam-it

For the future, let's create working branches for PRs in forked repos.

Absolutely @waldekmastykarz, I'm not sure what has happened here as I always work from my fork 🤷🏻‍♂️

@Adam-it if this is causing you issues I'm more than happy to re-raise from my fork.

garrytrinder avatar Aug 21 '22 18:08 garrytrinder

@waldekmastykarz, @garrytrinder sorry for taking so long on this one. ok so just to be on the save side I rebased the july22-deps to a local prmain branch (copy of main) and then merged it to the main locally and I have the @garrytrinder changes on tops of main image

You think thats ok ?

Adam-it avatar Aug 22 '22 13:08 Adam-it

Seems like it: if your main is synced with origin/main (not sure what the red crosses in your UI are) and your local main now shows an extra commit for the dependencies, it seems fine

waldekmastykarz avatar Aug 23 '22 13:08 waldekmastykarz

merge manually. Thanks for the awesome work and your help in merging this PR 😉

Adam-it avatar Aug 24 '22 18:08 Adam-it