From 8a5f9b51943f189f3147700c24748853a06c22d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartosz=20Go=C5=9Bci=C5=84ski?= Date: Tue, 25 Jan 2022 20:40:56 +0100 Subject: [PATCH] Update merge-anything to 5.0.0 --- package.json | 2 +- pnpm-lock.yaml | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 6bbe238..c7bb06c 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "@babel/core": "^7.16.7", "@babel/preset-typescript": "^7.16.7", "babel-preset-solid": "^1.3.0", - "merge-anything": "^4.0.2", + "merge-anything": "^5.0.0", "solid-js": "^1.3.0", "solid-refresh": "^0.4.0", "vite": "^2.7.13" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 50295da..cf7843b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,7 +12,7 @@ specifiers: '@types/babel__core': ^7.1.18 '@types/node': ^17.0.7 babel-preset-solid: ^1.3.0 - merge-anything: ^4.0.2 + merge-anything: ^5.0.0 prettier: ^2.5.1 rollup: ^2.62.0 rollup-plugin-cleaner: ^1.0.0 @@ -25,7 +25,7 @@ dependencies: '@babel/core': 7.16.7 '@babel/preset-typescript': 7.16.7_@babel+core@7.16.7 babel-preset-solid: 1.3.2_@babel+core@7.16.7 - merge-anything: 4.0.2 + merge-anything: 5.0.0 solid-js: 1.3.2 solid-refresh: 0.4.0_solid-js@1.3.2 vite: 2.7.13 @@ -1750,8 +1750,9 @@ packages: '@types/estree': 0.0.50 dev: true - /is-what/3.14.1: - resolution: {integrity: sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==} + /is-what/4.1.5: + resolution: {integrity: sha512-yUKI+eo3dzlxpCsVPRYmbh4PeLmFrbDF1V/Wj0Mj/ge9FwlK4PFSqahpg/6Mvma+NE3pd25PpDeb0WgR3Igtjg==} + engines: {node: '>=12.13', npm: '>=7'} dev: false /js-tokens/4.0.0: @@ -1790,10 +1791,11 @@ packages: sourcemap-codec: 1.4.8 dev: true - /merge-anything/4.0.2: - resolution: {integrity: sha512-YxLHKgX8jN5xfKIxcwVNzQ2HpS0r9eUSqifgGhVARoZEW31Jwu95OQzX7qlFPBPQdCmNBhCYaqJzOcwAKi2Elg==} + /merge-anything/5.0.0: + resolution: {integrity: sha512-xAMtZe8CwKJkfMmY6TReuRT8A2lYukVOiAntDnkJttetreN6ITB/OyCKoFDPodKqLCQmPB5D600rf4CQxTOKxw==} + engines: {node: '>=12.13', npm: '>=7'} dependencies: - is-what: 3.14.1 + is-what: 4.1.5 ts-toolbelt: 9.6.0 dev: false