tashow/tashow-manager
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 合并冲突

Browse Source
This commit is contained in:
qianpw
2025-10-30 16:26:21 +08:00
parent 126ee7b50a d9117c7675
commit 2ad04594fe
213 changed files with 17247 additions and 5066 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
pnpm-lock.yaml generated
View File

@@ -20,15 +20,27 @@ importers:
'@icon-park/react':
specifier: ^1.4.2
version: 1.4.2(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
'@dnd-kit/core':
specifier: ^6.3.1
version: 6.3.1(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
'@dnd-kit/sortable':
specifier: ^10.0.0
version: 10.0.0(@dnd-kit/core@6.3.1(react-dom@19.1.1(react@19.1.1))(react@19.1.1))(react@19.1.1)
'@dnd-kit/utilities':
specifier: ^3.2.2
version: 3.2.2(react@19.1.1)
'@tinymce/tinymce-react':
specifier: ^6.3.0
version: 6.3.0(react-dom@19.1.1(react@19.1.1))(react@19.1.1)(tinymce@8.1.2)
antd:
specifier: ^5.26.4
specifier: ^5.27.3
version: 5.27.3(date-fns@2.30.0)(moment@2.30.1)(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
antd-style:
specifier: ^3.7.0
version: 3.7.1(@types/react@19.1.12)(antd@5.27.3(date-fns@2.30.0)(moment@2.30.1)(react-dom@19.1.1(react@19.1.1))(react@19.1.1))(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
browser-id3-writer:
specifier: ^6.3.1
version: 6.3.1
classnames:
specifier: ^2.5.1
version: 2.5.1
@@ -50,6 +62,9 @@ importers:
react-infinite-scroll-component:
specifier: ^6.1.0
version: 6.1.0(react@19.1.1)
react-video-thumbnail:
specifier: ^0.1.3
version: 0.1.3
tinymce:
specifier: ^8.1.2
version: 8.1.2
@@ -1413,6 +1428,12 @@ packages:
'@dnd-kit/core': ^6.0.6
react: '>=16.8.0'
'@dnd-kit/sortable@10.0.0':
resolution: {integrity: sha512-+xqhmIIzvAYMGfBYYnbKuNicfSsk4RksY2XdmJhT+HAC01nix6fHCztU68jooFiMUB01Ky3F0FyOvhG/BZrWkg==}
peerDependencies:
'@dnd-kit/core': ^6.3.0
react: '>=16.8.0'
'@dnd-kit/sortable@7.0.2':
resolution: {integrity: sha512-wDkBHHf9iCi1veM834Gbk1429bd4lHX4RpAwT0y2cHLf246GAvU2sVw/oxWNpPKQNQRQaeGXhAVgrOl1IT+iyA==}
peerDependencies:
@@ -3860,6 +3881,9 @@ packages:
brorand@1.1.0:
resolution: {integrity: sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==}
browser-id3-writer@6.3.1:
resolution: {integrity: sha512-sRA4Uq9Q3NsmXiVpLvIDxzomtgCdbw6SY85A6fw7dUQGRVoOBg1/buFv6spPhYiSo6FlVtN5OJQTvvhbmfx9rQ==}
browserify-aes@1.2.0:
resolution: {integrity: sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==}
@@ -9158,6 +9182,9 @@ packages:
react-tween-state@0.1.5:
resolution: {integrity: sha512-sJQpjsdn0wjlDIUpfpb7jQGnOG8hAEW2e8k0KPA+xmf5KFa6Xat2JldbmxBhaqP0S/uIXhVE5ymKyH/b9X8nYA==}
react-video-thumbnail@0.1.3:
resolution: {integrity: sha512-ZakEVv9RNFcziAnHHtwod5tf0yMVv4aLZ8/QsCxt1HTnKRHrlylvolPKv1hr63GCwnPu6tgPjUTDKRqfl30lOQ==}
react@18.3.1:
resolution: {integrity: sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==}
engines: {node: '>=0.10.0'}
@@ -13404,6 +13431,13 @@ snapshots:
react: 19.1.1
tslib: 2.8.1
'@dnd-kit/sortable@10.0.0(@dnd-kit/core@6.3.1(react-dom@19.1.1(react@19.1.1))(react@19.1.1))(react@19.1.1)':
dependencies:
'@dnd-kit/core': 6.3.1(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
'@dnd-kit/utilities': 3.2.2(react@19.1.1)
react: 19.1.1
tslib: 2.8.1
'@dnd-kit/sortable@7.0.2(@dnd-kit/core@6.3.1(react-dom@19.1.1(react@19.1.1))(react@19.1.1))(react@19.1.1)':
dependencies:
'@dnd-kit/core': 6.3.1(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
@@ -16936,6 +16970,8 @@ snapshots:
brorand@1.1.0: {}
browser-id3-writer@6.3.1: {}
browserify-aes@1.2.0:
dependencies:
buffer-xor: 1.0.3
@@ -23483,6 +23519,8 @@ snapshots:
raf: 3.4.1
tween-functions: 1.2.0
react-video-thumbnail@0.1.3: {}
react@18.3.1:
dependencies:
loose-envify: 1.4.0