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

Switch from npm to pnpm, webpack to vite #884

Merged
merged 12 commits into from
Oct 9, 2023

Conversation

JoltCode
Copy link
Contributor

@JoltCode JoltCode commented Oct 7, 2023

Closes #882, closes #883

@spwoodcock
Copy link
Member

Please change the base branch from main --> development.

In the future we may make this the default branch, but for now we have to manually change on each PR.

Thanks!

@JoltCode
Copy link
Contributor Author

JoltCode commented Oct 7, 2023

Please change the base branch from main --> development.

In the future we may make this the default branch, but for now we have to manually change on each PR.

Thanks!

Ohh will do! 👍

@JoltCode
Copy link
Contributor Author

JoltCode commented Oct 7, 2023

Thanks! 😄

@spwoodcock
Copy link
Member

Looks like you branched from main at the start - sorry it's not very clear that we do all development and merging with the development branch.

This is a good prompt that we should probably clarify the process a bit better in the docs.

To fix this PR, you can either rebase: git rebase development and fix conflicts.

Or easier may be to make a new branch and cherry pick your commits there 👍

@spwoodcock
Copy link
Member

Also you probably noticed the CI triggering on each push, so it may be better to push in batches of that's ok

@JoltCode
Copy link
Contributor Author

JoltCode commented Oct 7, 2023

Looks like you branched from main at the start - sorry it's not very clear that we do all development and merging with the development branch.

This is a good prompt that we should probably clarify the process a bit better in the docs.

To fix this PR, you can either rebase: git rebase development and fix conflicts.

Or easier may be to make a new branch and cherry pick your commits there 👍

No worries! Yeah I did a merge and tried to solve the conflicts, seems I messed up the backend folder though... Just trying to sort that at the moment :)

@JoltCode
Copy link
Contributor Author

JoltCode commented Oct 7, 2023

Also you probably noticed the CI triggering on each push, so it may be better to push in batches of that's ok

Yep 👍

@JoltCode
Copy link
Contributor Author

JoltCode commented Oct 8, 2023

ughh :(

@JoltCode
Copy link
Contributor Author

JoltCode commented Oct 8, 2023

There we go! 😄

@JoltCode
Copy link
Contributor Author

JoltCode commented Oct 8, 2023

(sorry have still been doing quite a few individual pushes, just was trying to sort my git tree) :)

@JoltCode JoltCode marked this pull request as ready for review October 8, 2023 01:18
@JoltCode
Copy link
Contributor Author

JoltCode commented Oct 8, 2023

Should be ready for a review now @spwoodcock 🎉 - I also migrated the frontend testing from Jest -> Vitest - seemed Vite just didn't want to play ball with Jest, and thought may as well move to Vitest while I'm at it with the Vite migration.

@spwoodcock spwoodcock added enhancement New feature or request frontend Related to frontend code labels Oct 8, 2023
Copy link
Member

@spwoodcock spwoodcock left a comment

Choose a reason for hiding this comment

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

Nice PR - great stuff - I will do a build and test tomorrow and merge in 👍

@JoltCode
Copy link
Contributor Author

JoltCode commented Oct 9, 2023

Nice PR - great stuff - I will do a build and test tomorrow and merge in 👍

Perfect thanks!

@petya-kangalova
Copy link
Contributor

Thank you so much for your contribution @JoltCode ! It is really appreciated !

@spwoodcock spwoodcock merged commit dafa94a into hotosm:development Oct 9, 2023
@spwoodcock
Copy link
Member

@all-contributors add @JoltCode for code

@allcontributors
Copy link
Contributor

@spwoodcock

I've put up a pull request to add @JoltCode! 🎉

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request frontend Related to frontend code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Switch from webpack -> vite Switch from npm -> pnpm
3 participants