Merge account management work

awslabs / aws-api-gateway-developer-portal

A Serverless Developer Portal for easily publishing and cataloging APIs

Apache License 2.0

928 stars 400 forks source link

Closed ghost closed 4 years ago

ghost commented 4 years ago

Issue #, if available:

Description of changes:

Merged changes from the account-mgmt branch
Ejected from Standard to ESLint for an easier dev experience (and because I needed to make a couple customizations to it for Jest and the CRA scripts)
Fixed a few more critical issues so tests would pass

Note: this is blocked on #350 as it's based on that.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

ghost commented 4 years ago

The Git history is a mild mess, but that's because of three things:

I merged it incrementally, because it wouldn't merge cleanly initially and had a lot of merge conflicts.
I cherry-picked about 1/3 of my commits to include in #350, and so I had to re-merge everything.
When I went to re-merge the branch, I had to do it in two parts to avoid some odd merge conflicts where Git didn't want to properly diff two changed files and instead just listed them as "both added". I couldn't just cherry-pick the merge commits in question as it'd lose their parents, and I wanted to keep the history intact.

Edit: clarity