Merge `trunk` into `wcs-migration` branch

Automattic / woocommerce-services

WooCommerce Services is a feature plugin that integrates hosted services into WooCommerce (3.0+), and currently includes automated tax rates and the ability to purchase and print USPS shipping labels.

GNU General Public License v2.0

108 stars 20 forks source link

Merge `trunk` into `wcs-migration` branch #2778

Closed Ferdev closed 3 months ago

Ferdev commented 4 months ago

Description

This PR merge the latest changes from the trunk branch into the wcs-migration branch.

Related issue(s)

N/A

Steps to reproduce & screenshots/GIFs

Check out latest trunk in woocommerce-shipping.
Check out this branch.
Make sure you can enable both plugins, and the migration flow banners work as expected.

Checklist

[ ] unit tests

[ ] changelog.txt entry added
[ ] readme.txt entry added

Ferdev commented 4 months ago

I've tried to run the e2e tests locally, but even checking out trunk they don't pass in my machine. I get a lot of random timeouts in different tests each run. @kallehauge can you try running them locally? you have to:

npm run test:e2e-docker-up
npm run test:e2e

kallehauge commented 4 months ago

You bet! Giving it a swing now @Ferdev.

Edit: Trunk is working for me, so giving the branch a go again

Ferdev commented 3 months ago

I'm closing this PR in favor of https://github.com/Automattic/woocommerce-services/pull/2783, which rebases instead of merging trunk, which makes the whole merge cleaner. If you don't mind, I'm gonna add you as reviewer in the other PR, @kallehauge :innocent: