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

chore: merge release v5.39.1 back to develop (update package-lock.json back to v1) #3222

Merged
merged 6 commits into from
Dec 30, 2021

Conversation

karrui
Copy link
Contributor

@karrui karrui commented Dec 22, 2021

This supersedes #3221 due to the accidental change of lockfile version from v1 to v2.
This commit adds an additional commit that merges develop into the branch.

This branch is identical to release with the additional of 1 commit 577ab29 with develop to restore v1 lockfile.

…ngoose to v5.13.13 (#3219)

* Revert "feat(deps): update mongoose to v6.0.13, update mongoose dependencies likewise (#3093)"

This reverts commit d5ada10.

# Conflicts:
#	package-lock.json
#	package.json
#	src/app/models/form.server.model.ts

* fix: update package-lock

pinned mongoose to prior version before unlocking it due to type changes in minor patch versions of mongoose...

* fix: add missing ClientSession import

* feat: update mongoose v5.13.5 to v5.13.13

snyk doesn't allow vulnerabilities....... which 5.13.5 contains oops

* fix: mongoose v5.13.13 type updates in models

* fix(test): convert mockingoose mocks to normal jest spy mocks

* feat: remove unused mockingoose package
Package-lock.json conflicts due to reverting changes to mongoose from v6 to v5.
@tshuli tshuli merged commit ece0d16 into develop Dec 30, 2021
@tshuli tshuli deleted the release-develop-package-merge branch December 30, 2021 05:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants