From b72b1766cc17905f4bf67c92d4177240befa5cf3 Mon Sep 17 00:00:00 2001 From: Jannik Stehle Date: Mon, 11 Dec 2023 13:45:55 +0100 Subject: [PATCH] fix: remove deepmerge dep and use lodash instead --- packages/web-pkg/package.json | 1 - packages/web-pkg/src/composables/piniaStores/theme.ts | 2 +- pnpm-lock.yaml | 3 --- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/web-pkg/package.json b/packages/web-pkg/package.json index 19561c996a3..d0f08b5e82d 100644 --- a/packages/web-pkg/package.json +++ b/packages/web-pkg/package.json @@ -29,7 +29,6 @@ "@uppy/xhr-upload": "^3.0.1", "@vueuse/core": "^10.0.0", "axios": "1.6.2", - "deepmerge": "^4.2.2", "design-system": "workspace:@ownclouders/design-system@*", "dompurify": "^3.0.6", "filesize": "^9.0.11", diff --git a/packages/web-pkg/src/composables/piniaStores/theme.ts b/packages/web-pkg/src/composables/piniaStores/theme.ts index 6f44a39b565..a3a97ccf25c 100644 --- a/packages/web-pkg/src/composables/piniaStores/theme.ts +++ b/packages/web-pkg/src/composables/piniaStores/theme.ts @@ -1,4 +1,4 @@ -import merge from 'deepmerge' +import merge from 'lodash-es/merge' import { defineStore } from 'pinia' import { ref, computed, unref } from 'vue' import { useLocalStorage, usePreferredDark } from '@vueuse/core' diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 188f0d40874..5a717883042 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1049,9 +1049,6 @@ importers: axios: specifier: 1.6.2 version: 1.6.2 - deepmerge: - specifier: ^4.2.2 - version: 4.2.2 design-system: specifier: workspace:@ownclouders/design-system@* version: link:../design-system