From e5d00e894ba84809e72c16d553baa9e188c8fe5c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Nov 2024 12:37:20 +0100 Subject: [PATCH] chore(deps-dev): bump json-merger from 1.1.10 to 2.0.0 (#10201) Bumps [json-merger](https://github.com/boschni/json-merger) from 1.1.10 to 2.0.0. - [Release notes](https://github.com/boschni/json-merger/releases) - [Commits](https://github.com/boschni/json-merger/commits/v2.0.0) --- updated-dependencies: - dependency-name: json-merger dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 48 +++++++++++++++-------------------------------- package.json | 2 +- 2 files changed, 16 insertions(+), 34 deletions(-) diff --git a/package-lock.json b/package-lock.json index f6785b04ddf..511f871cc69 100644 --- a/package-lock.json +++ b/package-lock.json @@ -93,7 +93,7 @@ "jest-transform-stub": "=2.0.0", "jsdom": "=25.0.1", "json-loader": "^0.5.7", - "json-merger": "^1.1.10", + "json-merger": "^2.0.0", "json-server": "=0.17.4", "less": "^4.2.0", "license-checker": "^25.0.0", @@ -17126,36 +17126,35 @@ "dev": true }, "node_modules/json-merger": { - "version": "1.1.10", - "resolved": "https://registry.npmjs.org/json-merger/-/json-merger-1.1.10.tgz", - "integrity": "sha512-S2fLqKZKmCtJ87GQDcAM0gkw0Ep4a8KAXFTqGb2JOsduPj8mYzVwLFI5z8ZXtY7vJ8cjVXaUKNUh5wekoXjCUQ==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/json-merger/-/json-merger-2.0.0.tgz", + "integrity": "sha512-CEAXlid1Q9X064q1oSPfFh9hq/kJg64DjXr46mjD76VKBIdqeNYbZXLHr+HcRioDke5I4XnZ3iVIl2ysRioayA==", "dev": true, "dependencies": { - "commander": "^9.1.0", - "fs-extra": "^10.0.1", + "commander": "^12.1.0", + "fs-extra": "^11.2.0", "js-yaml": "^4.1.0", "json-ptr": "^3.1.1", "jsonpath": "^1.1.1", - "lodash.range": "^3.2.0", - "vm2": "^3.9.17" + "lodash.range": "^3.2.0" }, "bin": { "json-merger": "bin/json-merger.js" } }, "node_modules/json-merger/node_modules/commander": { - "version": "9.5.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz", - "integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==", + "version": "12.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz", + "integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==", "dev": true, "engines": { - "node": "^12.20.0 || >=14" + "node": ">=18" } }, "node_modules/json-merger/node_modules/fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz", + "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==", "dev": true, "dependencies": { "graceful-fs": "^4.2.0", @@ -17163,7 +17162,7 @@ "universalify": "^2.0.0" }, "engines": { - "node": ">=12" + "node": ">=14.14" } }, "node_modules/json-parse-better-errors": { @@ -27271,23 +27270,6 @@ "extsprintf": "^1.2.0" } }, - "node_modules/vm2": { - "version": "3.9.19", - "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.19.tgz", - "integrity": "sha512-J637XF0DHDMV57R6JyVsTak7nIL8gy5KH4r1HiwWLf/4GBbb5MKL5y7LpmF4A8E2nR6XmzpmMFQ7V7ppPTmUQg==", - "deprecated": "The library contains critical security issues and should not be used for production! The maintenance of the project has been discontinued. Consider migrating your code to isolated-vm.", - "dev": true, - "dependencies": { - "acorn": "^8.7.0", - "acorn-walk": "^8.2.0" - }, - "bin": { - "vm2": "bin/vm2" - }, - "engines": { - "node": ">=6.0" - } - }, "node_modules/w3c-xmlserializer": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz", diff --git a/package.json b/package.json index 6e2bb7f006e..e7f3a2e9c69 100644 --- a/package.json +++ b/package.json @@ -155,7 +155,7 @@ "jest-transform-stub": "=2.0.0", "jsdom": "=25.0.1", "json-loader": "^0.5.7", - "json-merger": "^1.1.10", + "json-merger": "^2.0.0", "json-server": "=0.17.4", "less": "^4.2.0", "license-checker": "^25.0.0",