Merge master into feature/endUserVaultRefresh. This required some tidy up work that is worthy of a PR, see detail below.
Code changes
I've done the following:
update jslib to point at jslib/feature/endUserVaultRefresh (HEAD)
merge with master and resolve merge conflicts
there were conflicts in package-lock.json - these were handled by accepting all changes from master, then running npm i
routing routes were being resolved in weird ways, causing unexpected/buggy behaviour. I believe this is because feature modules that should have been lazy loaded were being imported into OssModule and being eagerly loaded before the parent routes. Fixed this here: Do not eagerly load feature modules.
Also renamed some routing modules from thing.module.ts to thing-routing.module.ts to make it clear they're routing modules and not feature modules: see Routing modules should have routing in their name. We're following 2 different patterns here, sometimes we have a whole feature module, sometimes it's just a standalone routing module. Should probably clean this up but that can be done later.
Items 4-5 are probably the only bits that require a code review, otherwise I just would've pushed directly to the branch.
Screenshots
Testing requirements
Before you submit
[x] I have checked for linting errors (npm run lint) (required)
[ ] This change requires a documentation update (notify the documentation team)
[ ] This change has particular deployment requirements (notify the DevOps team)
Type of change
Objective
Merge
masterintofeature/endUserVaultRefresh. This required some tidy up work that is worthy of a PR, see detail below.Code changes
I've done the following:
jslib/feature/endUserVaultRefresh(HEAD)masterand resolve merge conflictspackage-lock.json- these were handled by accepting all changes frommaster, then runningnpm iOssModuleand being eagerly loaded before the parent routes. Fixed this here: Do not eagerly load feature modules.thing.module.tstothing-routing.module.tsto make it clear they're routing modules and not feature modules: see Routing modules should have routing in their name. We're following 2 different patterns here, sometimes we have a whole feature module, sometimes it's just a standalone routing module. Should probably clean this up but that can be done later.Items 4-5 are probably the only bits that require a code review, otherwise I just would've pushed directly to the branch.
Screenshots
Testing requirements
Before you submit
npm run lint) (required)