From 093b9e963aebf7f26a7bd9559273cfbbb035114d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 May 2021 03:03:04 +0000 Subject: [PATCH] Bump merge from 1.2.1 to 2.1.1 in /ClientApp Bumps [merge](https://github.com/yeikos/js.merge) from 1.2.1 to 2.1.1. - [Release notes](https://github.com/yeikos/js.merge/releases) - [Commits](https://github.com/yeikos/js.merge/compare/v1.2.1...v2.1.1) Signed-off-by: dependabot[bot] --- ClientApp/package-lock.json | 9 +++++---- ClientApp/package.json | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ClientApp/package-lock.json b/ClientApp/package-lock.json index 328c237..17251ff 100644 --- a/ClientApp/package-lock.json +++ b/ClientApp/package-lock.json @@ -7866,9 +7866,9 @@ } }, "merge": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz", - "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==" + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/merge/-/merge-2.1.1.tgz", + "integrity": "sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w==" }, "merge-deep": { "version": "3.0.2", @@ -9969,7 +9969,8 @@ "prettier": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz", - "integrity": "sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==" + "integrity": "sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==", + "dev": true }, "pretty-bytes": { "version": "5.3.0", diff --git a/ClientApp/package.json b/ClientApp/package.json index e05ffc8..83c1ec1 100644 --- a/ClientApp/package.json +++ b/ClientApp/package.json @@ -6,7 +6,7 @@ "@auth0/auth0-spa-js": "^1.8.1", "bootstrap": "^4.4.1", "jquery": "^3.5.1", - "merge": "^1.2.1", + "merge": "^2.1.1", "oidc-client": "^1.10.1", "react": "^16.13.1", "react-dom": "^16.13.1",