Niklas/shadcn-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: fix incorrect merge

Browse Source
This commit is contained in:
sadeghbarati 2024-02-21 14:45:58 +03:30
parent 8bae3c6f81
commit 66e5dfcbae
2 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/cli/package.json
View File

@ -51,7 +51,7 @@
"c12": "^1.8.0",
"commander": "^12.0.0",
"consola": "^3.2.3",
"detype": "npm:detypes@^0.7.6",
"detype": "npm:detypes@^0.7.9",
"diff": "^5.2.0",
"fs-extra": "^11.2.0",
"https-proxy-agent": "^7.0.4",

25
pnpm-lock.yaml
View File

@ -94,7 +94,7 @@ importers:
version: 0.276.0(vue@3.4.19)
radix-vue:
specifier: ^1.4.8
version: 1.4.8(vue@3.4.15)
version: 1.4.8(vue@3.4.19)
tailwindcss-animate:
specifier: ^1.0.7
version: 1.0.7(tailwindcss@3.4.1)
@ -217,8 +217,8 @@ importers:
specifier: ^3.2.3
version: 3.2.3
detype:
specifier: npm:detypes@^0.7.9
version: /detypes@0.7.9
specifier: npm:detypes@^0.7.6
version: /detypes@0.7.6
diff:
specifier: ^5.2.0
version: 5.2.0
@ -4444,6 +4444,7 @@ packages:
lru-cache: 6.0.0
source-map: 0.6.1
dev: false
/@vuedx/template-ast-types@0.7.1:
resolution: {integrity: sha512-Mqugk/F0lFN2u9bhimH6G1kSu2hhLi2WoqgCVxrMvgxm2kDc30DtdvVGRq+UgEmKVP61OudcMtZqkUoGQeFBUQ==}
dependencies:
@ -6241,8 +6242,8 @@ packages:
engines: {node: '>=8'}
dev: true
/detypes@0.7.9:
resolution: {integrity: sha512-4dGl/e6rHnIFU+2HB9B//0sV0pMx8eLnzN4zfTg9FWAkuFqv8MPVmZo1fLoOjHzTGRzKH8mr/mzKmZ2DcOuCkg==}
/detypes@0.7.6:
resolution: {integrity: sha512-u4FNjEoBY/Wxhtim3JX5sIZzfRsjYiaaWX0SCPbNkU0NbIcvcVPW0TzFPXdq1td6XoCxIMdmY/B/XmMLYOCqPA==}
engines: {node: '>=18'}
hasBin: true
dependencies:
@ -6251,7 +6252,6 @@ packages:
'@vue/compiler-dom': 3.4.19
'@vue/compiler-sfc': 3.4.19
'@vuedx/compiler-sfc': 0.7.1
'@vuedx/template-ast-types': 0.7.1
fast-glob: 3.3.2
prettier: 2.8.8
@ -10676,21 +10676,10 @@ packages:
resolution: {integrity: sha512-RKJ22hX8mHe3Y6wH/N3wCM6BWtjaxIyyUIkpHOvfFnxdI4yD4tBXEBKSbriGujF6jnSVkJrffuo6vxACiSSxIw==}
dev: false
/radix-vue@1.4.6(vue@3.4.19):
resolution: {integrity: sha512-PWM4A0xyQV4bu8R+DfAGGEN4zRTM0Qer5rH+gLnQjjsz0kjteZhVOS0KUkpyrKVPprWFYRNqyzpjjkcYBDrlfQ==}
dependencies:
'@floating-ui/dom': 1.6.3
'@floating-ui/vue': 1.0.6(vue@3.4.19)
fast-deep-equal: 3.1.3
transitivePeerDependencies:
- '@vue/composition-api'
- vue
dev: false
/radix-vue@1.4.8(vue@3.4.19):
resolution: {integrity: sha512-DDCA9QjyBpV9iOyUrSWjK8B5j78aFKZFl8DRGKYeR7l4nIejtxulVyWzaCk4lv+KXmupyP9SXC4LlC3AGjeR5w==}
dependencies:
'@floating-ui/dom': 1.6.1
'@floating-ui/dom': 1.6.3
'@floating-ui/vue': 1.0.6(vue@3.4.19)
fast-deep-equal: 3.1.3
transitivePeerDependencies: