diff --git a/packages/ui/package.json b/packages/ui/package.json index 2931d9621e..bb78f38bb5 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -142,7 +142,7 @@ "i18next-intervalplural-postprocessor": "3.0.0", "luxon": "3.4.4", "mantine-react-table": "1.3.4", - "merge-anything": "5.1.7", + "merge-anything": "6.0.2", "msw": "2.3.1", "msw-storybook-addon": "2.0.2", "next": "14.2.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5ef8a6c226..6f406a8d74 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1613,8 +1613,8 @@ importers: specifier: 1.3.4 version: 1.3.4(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@mantine/core@6.0.21(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@mantine/hooks@6.0.21(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mantine/dates@6.0.21(@mantine/core@6.0.21(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@mantine/hooks@6.0.21(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mantine/hooks@6.0.21(react@18.3.1))(dayjs@1.11.11)(react@18.3.1))(@mantine/hooks@6.0.21(react@18.3.1))(@tabler/icons-react@3.5.0(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1) merge-anything: - specifier: 5.1.7 - version: 5.1.7 + specifier: 6.0.2 + version: 6.0.2 msw: specifier: 2.3.1 version: 2.3.1(typescript@5.4.5) @@ -9689,6 +9689,10 @@ packages: resolution: {integrity: sha512-ZhMwEosbFJkA0YhFnNDgTM4ZxDRsS6HqTo7qsZM08fehyRYIYa0yHu5R6mgo1n/8MgaPBXiPimPD77baVFYg+A==} engines: {node: '>=12.13'} + is-what@5.0.2: + resolution: {integrity: sha512-vI7Ui0qzNQ2ClDZd0bC7uqRk3T1imbX5cZODmVlqqdqiwmSIUX3CNSiRgFjFMJ987sVCMSa7xZeEDtpJduPg4A==} + engines: {node: '>=18'} + is-windows@0.2.0: resolution: {integrity: sha512-n67eJYmXbniZB7RF4I/FTjK1s6RPOCTxhYrVYLRaCt3lF0mpWZPKr3T2LSZAqyjQsxR2qMmGYXXzK0YWwcPM1Q==} engines: {node: '>=0.10.0'} @@ -10638,9 +10642,9 @@ packages: resolution: {integrity: sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==} engines: {node: '>=10'} - merge-anything@5.1.7: - resolution: {integrity: sha512-eRtbOb1N5iyH0tkQDAoQ4Ipsp/5qSR79Dzrz8hEPxRX10RWWR/iQXdoKmBSRCThY1Fh5EhISDtpSc93fpxUniQ==} - engines: {node: '>=12.13'} + merge-anything@6.0.2: + resolution: {integrity: sha512-U8x6DL/YVudOcf82B6hd8GFg+6gF6hEHYwzqdo67GrH6vnDZ5YBq6BYX3hHWyCnG3CcqJDB1a9tj9fzMI3RL9Q==} + engines: {node: '>=18'} merge-descriptors@1.0.1: resolution: {integrity: sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==} @@ -25248,6 +25252,8 @@ snapshots: is-what@4.1.16: {} + is-what@5.0.2: {} + is-windows@0.2.0: {} is-windows@1.0.2: {} @@ -26660,9 +26666,9 @@ snapshots: type-fest: 0.18.1 yargs-parser: 20.2.9 - merge-anything@5.1.7: + merge-anything@6.0.2: dependencies: - is-what: 4.1.16 + is-what: 5.0.2 merge-descriptors@1.0.1: {}