resolve conflict

This commit is contained in:
hagiye
2026-06-05 14:13:35 +03:00
parent b33517f47d
commit c3e92dbe70
7 changed files with 44 additions and 140 deletions

33
pnpm-lock.yaml generated
View File

@@ -184,6 +184,9 @@ importers:
'@edr/ui-common':
specifier: workspace:*
version: link:../../../packages/ui-common
'@hello-pangea/dnd':
specifier: ^18.0.1
version: 18.0.1(@types/react@18.3.29)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
'@tanstack/react-query':
specifier: ^5.100.11
version: 5.100.11(react@19.2.6)
@@ -1377,6 +1380,12 @@ packages:
'@gilbarbara/deep-equal@0.3.1':
resolution: {integrity: sha512-I7xWjLs2YSVMc5gGx1Z3ZG1lgFpITPndpi8Ku55GeEIKpACCPQNS/OTqQbxgTCfq0Ncvcc+CrFov96itVh6Qvw==}
'@hello-pangea/dnd@18.0.1':
resolution: {integrity: sha512-xojVWG8s/TGrKT1fC8K2tIWeejJYTAeJuj36zM//yEm/ZrnZUSFGS15BpO+jGZT1ybWvyXmeDJwPYb4dhWlbZQ==}
peerDependencies:
react: 19.2.6
react-dom: 19.2.6
'@hono/node-server@1.19.14':
resolution: {integrity: sha512-GwtvgtXxnWsucXvbQXkRgqksiH2Qed37H9xHZocE5sA3N8O8O8/8FA3uclQXxXVzc9XBZuEOMK7+r02FmSpHtw==}
engines: {node: '>=18.14.1'}
@@ -5331,6 +5340,9 @@ packages:
resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==}
engines: {node: '>= 8'}
css-box-model@1.2.1:
resolution: {integrity: sha512-a7Vr4Q/kd/aw96bnJG332W9V9LkJO69JRcaCYDUqjp6/z0w6VcZjgAcTbgFxEPfBgdnAwlh3iwu+hLopa+flJw==}
css-line-break@2.1.0:
resolution: {integrity: sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==}
@@ -8537,6 +8549,9 @@ packages:
'@types/react-dom':
optional: true
raf-schd@4.0.3:
resolution: {integrity: sha512-tQkJl2GRWh83ui2DiPTJz9wEiMN20syf+5oKfB03yYP7ioZcJwsIK8FjrtLwH1m7C7e+Tt2yYBlrOpdT+dyeIQ==}
raf@3.4.1:
resolution: {integrity: sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==}
@@ -11264,6 +11279,18 @@ snapshots:
'@gilbarbara/deep-equal@0.3.1': {}
'@hello-pangea/dnd@18.0.1(@types/react@18.3.29)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
dependencies:
'@babel/runtime': 7.29.2
css-box-model: 1.2.1
raf-schd: 4.0.3
react: 19.2.6
react-dom: 19.2.6(react@19.2.6)
react-redux: 9.3.0(@types/react@18.3.29)(react@19.2.6)(redux@5.0.1)
redux: 5.0.1
transitivePeerDependencies:
- '@types/react'
'@hono/node-server@1.19.14(hono@4.12.22)':
dependencies:
hono: 4.12.22
@@ -16070,6 +16097,10 @@ snapshots:
shebang-command: 2.0.0
which: 2.0.2
css-box-model@1.2.1:
dependencies:
tiny-invariant: 1.3.3
css-line-break@2.1.0:
dependencies:
utrie: 1.0.2
@@ -19735,6 +19766,8 @@ snapshots:
'@types/react': 18.3.29
'@types/react-dom': 18.3.7(@types/react@18.3.29)
raf-schd@4.0.3: {}
raf@3.4.1:
dependencies:
performance-now: 2.1.0