From ee33bd8e63cae6d5f51b8b8b049e26acadd68e88 Mon Sep 17 00:00:00 2001 From: DebaucheryLibrarian Date: Sun, 15 Aug 2021 04:28:56 +0200 Subject: [PATCH] Upgraded object-merge-advanced. --- package-lock.json | 63 +++++++++++++++++++---------------------------- package.json | 2 +- 2 files changed, 26 insertions(+), 39 deletions(-) diff --git a/package-lock.json b/package-lock.json index de919cfa..2534fd2d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2048,11 +2048,6 @@ } } }, - "append-type": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/append-type/-/append-type-1.0.2.tgz", - "integrity": "sha512-hac740vT/SAbrFBLgLIWZqVT5PUAcGTWS5UkDDhr+OCizZSw90WKw6sWAEgGaYd2viIblggypMXwpjzHXOvAQg==" - }, "aproba": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", @@ -2135,20 +2130,13 @@ "is-string": "^1.0.5" } }, - "array-includes-all": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/array-includes-all/-/array-includes-all-2.0.0.tgz", - "integrity": "sha512-adtLgp4gowTJojppKRsyuco1B0YK1eOa2prwr1rCpF2ofOcuclx60W3GRqUpTVi3IorufS5uIZIilHECdl/5uA==", - "requires": { - "append-type": "^1.0.1" - } - }, "array-includes-with-glob": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/array-includes-with-glob/-/array-includes-with-glob-2.13.0.tgz", - "integrity": "sha512-J8t9J4b24wUDVtqH3GGI/HwpkrdG4HG/w/F2Q+uvuvlhDXDhW6Ymv4jWN9VF/H8FOLRTvze0fEFsY8YGFL0mAg==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/array-includes-with-glob/-/array-includes-with-glob-3.1.0.tgz", + "integrity": "sha512-/PZEKASyXWmUTkNhuxnmqybv1CmIdY5rp3axLy3Dv6SYfaBb+EgS7Nl991mquHT1N2u0YAnE3IOafVNRM6Y9dw==", "requires": { - "matcher": "^3.0.0" + "@babel/runtime": "^7.14.0", + "matcher": "^4.0.0" } }, "array-slice": { @@ -2184,14 +2172,6 @@ "function-bind": "^1.1.1" } }, - "arrayiffy-if-string": { - "version": "3.14.0", - "resolved": "https://registry.npmjs.org/arrayiffy-if-string/-/arrayiffy-if-string-3.14.0.tgz", - "integrity": "sha512-pQQDnM+wOBvgElVGB8//y16IpZEsi3mU3jkjvhJCm3J7zSvRPlm/8Wl76gE1O9vnU1CWcz2u5JfsOLtD7yvuLw==", - "requires": { - "@babel/runtime": "^7.14.0" - } - }, "arrify": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", @@ -7072,6 +7052,11 @@ "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", "integrity": "sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY=" }, + "lodash.isdate": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.isdate/-/lodash.isdate-4.0.1.tgz", + "integrity": "sha1-NaVDZzuddhEN5BFLMsxXcEin82Y=" + }, "lodash.isinteger": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", @@ -7228,9 +7213,9 @@ } }, "matcher": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz", - "integrity": "sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/matcher/-/matcher-4.0.0.tgz", + "integrity": "sha512-S6x5wmcDmsDRRU/c2dkccDwQPXoFczc5+HpQ2lON8pnvHlnvHAHj5WlLVvw6n6vNyHuVugYrFohYxbS+pvFpKQ==", "requires": { "escape-string-regexp": "^4.0.0" }, @@ -7913,17 +7898,18 @@ "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==" }, "object-merge-advanced": { - "version": "10.12.1", - "resolved": "https://registry.npmjs.org/object-merge-advanced/-/object-merge-advanced-10.12.1.tgz", - "integrity": "sha512-3K6oKbZCfxa8lJ+2jc8K0kQLeZiA4OWF9ScoTsq3TwaeIfjsn9sn70iaY7P/l/glCaO6nD8C8nyvVI/zZIcu9w==", + "version": "12.1.0", + "resolved": "https://registry.npmjs.org/object-merge-advanced/-/object-merge-advanced-12.1.0.tgz", + "integrity": "sha512-LHXjJNOQUyKglFvaOllSOxcNPzIITmysTGvomfyIzHlb6cWdPAJbsS0lpcE4Mbk6sdUkYk0bXpNdvXdpfbxXLQ==", "requires": { - "array-includes-all": "^2.0.0", - "array-includes-with-glob": "^2.13.0", - "arrayiffy-if-string": "^3.12.0", + "@babel/runtime": "^7.14.0", + "array-includes-with-glob": "^3.1.0", "lodash.clonedeep": "^4.5.0", "lodash.includes": "^4.3.0", + "lodash.isdate": "^4.0.1", + "lodash.isplainobject": "^4.0.6", "lodash.uniq": "^4.5.0", - "util-nonempty": "^2.10.0" + "util-nonempty": "^3.1.0" } }, "object-visit": { @@ -11269,10 +11255,11 @@ "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, "util-nonempty": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/util-nonempty/-/util-nonempty-2.10.0.tgz", - "integrity": "sha512-kidgZTwmgqhxIUAY71KQDJCQ10NcX+yF2sjata4D831ONPUMEtg2Q5vhYVF+2Lx4RVnJKMhcu2zRz8/7Fv7+4g==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/util-nonempty/-/util-nonempty-3.1.0.tgz", + "integrity": "sha512-OSZlWoCL74Go83Qw/aeZgSmFZnp9d06bF77b1eAOKipkPWhvxjRYB2nmKiGspoVjkJJEJimzxAgBFUQiUV/oZQ==", "requires": { + "@babel/runtime": "^7.14.0", "lodash.isplainobject": "^4.0.6" } }, diff --git a/package.json b/package.json index 5ad16296..2e7c7e2f 100644 --- a/package.json +++ b/package.json @@ -116,7 +116,7 @@ "mitt": "^2.1.0", "moment": "^2.24.0", "nanoid": "^2.1.11", - "object-merge-advanced": "^10.12.1", + "object-merge-advanced": "^12.1.0", "object.omit": "^3.0.0", "opn": "^5.5.0", "pg": "^8.5.1",