Skip to content

Commit 5054a34

Browse files
committed
raw
1 parent 39d6d60 commit 5054a34

File tree

7 files changed

+35
-82
lines changed

7 files changed

+35
-82
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"@vue/reactivity": "3.5.12",
6363
"@vue/server-renderer": "3.5.12",
6464
"@vue/compiler-dom": "3.5.12",
65-
"sass": "1.89.0",
65+
"sass": "^1.97.3",
6666
"typescript": "5.9.3",
6767
"vue-tsc": "3.2.4"
6868
},

packages/create-vuestic/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
"dependencies": {
1515
"chalk": "^5.6.2",
1616
"ora": "^9.3.0",
17-
"pathe": "2.0.3",
17+
"pathe": "^2.0.3",
1818
"prompts": "^2.4.2"
1919
},
2020
"devDependencies": {
21-
"@types/node": "^18.19.121",
21+
"@types/node": "22.12.0",
2222
"@types/prompts": "^2.4.2",
2323
"tsup": "^8.5.1",
2424
"tsx": "^4.21.0"

packages/ui/package.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,8 @@
4747
"@floating-ui/vue": "^1.1.8"
4848
},
4949
"devDependencies": {
50-
"@babel/core": "^7.12.3",
51-
"@babel/plugin-transform-modules-commonjs": "^7.12.1",
52-
"@babel/preset-env": "^7.12.1",
5350
"@faker-js/faker": "^8.0.2",
5451
"@fortawesome/fontawesome-free": "^6.1.1",
55-
"@fortawesome/fontawesome-svg-core": "^1.2.32",
56-
"@fortawesome/free-solid-svg-icons": "^5.15.1",
57-
"@fortawesome/vue-fontawesome": "^3.0.0-2",
5852
"@storybook/addon-essentials": "^7.1.0",
5953
"@storybook/addon-interactions": "^7.1.0",
6054
"@storybook/addon-links": "^7.1.0",

packages/ui/src/components/va-skeleton/VaSkeleton.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ const props = defineProps({
4343
const doShow = ref(false)
4444
const delayComputed = useNumericProp('delay') as ComputedRef<number>
4545
46-
let timeoutId: ReturnType<typeof setTimeout>
46+
let timeoutId: ReturnType<typeof setTimeout> | undefined
4747
onMounted(() => {
4848
clearTimeout(timeoutId)
4949
setTimeout(() => {

packages/ui/src/components/va-tree-view/components/VaTreeNode/VaTreeNode.vue

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
:color="colorComputed"
4040
:disabled="!!$props.node.disabled || $props.disabled"
4141
indeterminate
42-
@update:model-value="(v) => toggleCheckbox($props.node, v)"
42+
@update:model-value="toggleCheckbox($props.node, $event)"
4343
class="va-tree-node__checkbox"
4444
/>
4545
</slot>
@@ -67,8 +67,8 @@
6767
:expandable="$props.expandable"
6868
:node="childNode"
6969
>
70-
<template v-for="(_, name) in $slots" :key="name" v-slot:[name]="slotScope: any">
71-
<slot :name="name" v-bind="slotScope" />
70+
<template v-for="(_, name) in $slots" :key="name" v-slot:[name]="scope">
71+
<slot :name="name as 'content' | 'icon' | 'icon-toggle' | 'checkbox'" v-bind="scope" />
7272
</template>
7373
</va-tree-node>
7474
</div>
@@ -93,6 +93,13 @@ defineOptions({
9393
name: 'VaTreeNode',
9494
})
9595
96+
defineSlots<{
97+
content: (node: TreeNode) => any,
98+
icon: (node: TreeNode) => any,
99+
'icon-toggle': (node: TreeNode) => any,
100+
checkbox: (node: TreeNode) => any,
101+
}>()
102+
96103
const props = defineProps({
97104
node: {
98105
type: Object as PropType<TreeNode>,

packages/ui/src/utils/pick.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
export const pick = <Obj extends Record<string, any>, Keys extends keyof Obj>(o: Obj, keys: Keys[]) => {
2-
return (Object.keys(o) as Keys[])
3-
.filter((key: Keys) => keys.includes(key as Keys))
4-
.reduce((acc: Pick<Obj, Keys>, key: Keys) => {
1+
export const pick = <Obj extends Record<string, any>, const Keys extends readonly (keyof Obj)[]>(o: Obj, keys: Keys) => {
2+
return (Object.keys(o) as Keys[number][])
3+
.filter((key) => keys.includes(key))
4+
.reduce((acc, key) => {
55
acc[key] = o[key]
66
return acc
7-
}, { } as Pick<Obj, Keys>)
7+
}, { } as Pick<Obj, Keys[number]>)
88
}

yarn.lock

Lines changed: 16 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -996,7 +996,7 @@ __metadata:
996996
languageName: node
997997
linkType: hard
998998

999-
"@babel/plugin-transform-modules-commonjs@npm:^7.12.1, @babel/plugin-transform-modules-commonjs@npm:^7.23.0, @babel/plugin-transform-modules-commonjs@npm:^7.24.1, @babel/plugin-transform-modules-commonjs@npm:^7.25.9":
999+
"@babel/plugin-transform-modules-commonjs@npm:^7.23.0, @babel/plugin-transform-modules-commonjs@npm:^7.24.1, @babel/plugin-transform-modules-commonjs@npm:^7.25.9":
10001000
version: 7.25.9
10011001
resolution: "@babel/plugin-transform-modules-commonjs@npm:7.25.9"
10021002
dependencies:
@@ -1328,7 +1328,7 @@ __metadata:
13281328
languageName: node
13291329
linkType: hard
13301330

1331-
"@babel/preset-env@npm:^7.12.1, @babel/preset-env@npm:^7.23.2":
1331+
"@babel/preset-env@npm:^7.23.2":
13321332
version: 7.26.0
13331333
resolution: "@babel/preset-env@npm:7.26.0"
13341334
dependencies:
@@ -2566,55 +2566,13 @@ __metadata:
25662566
languageName: node
25672567
linkType: hard
25682568

2569-
"@fortawesome/fontawesome-common-types@npm:^0.2.36":
2570-
version: 0.2.36
2571-
resolution: "@fortawesome/fontawesome-common-types@npm:0.2.36"
2572-
checksum: 10/ea8575388b5ef67bb490a029bb1c13acd2a7f4e7a7cc00b6818a78aaa85be152075f8265558cec5751df560f74d9cdcddbc2f99a8e39265cd1ca63f3e9238c17
2573-
languageName: node
2574-
linkType: hard
2575-
2576-
"@fortawesome/fontawesome-common-types@npm:^0.3.0":
2577-
version: 0.3.0
2578-
resolution: "@fortawesome/fontawesome-common-types@npm:0.3.0"
2579-
checksum: 10/c0960d8f86bf7206e9dad547b5c636c4b0af972e47aa4dbac09d381e8e8fc9019fddd4437d71866a11a44af43f485396e4b09b40de40291d33621f8b91f627d7
2580-
languageName: node
2581-
linkType: hard
2582-
25832569
"@fortawesome/fontawesome-free@npm:^6.1.1":
25842570
version: 6.5.1
25852571
resolution: "@fortawesome/fontawesome-free@npm:6.5.1"
25862572
checksum: 10/ff6627084d550672235336b75d020d4e63b4089900cec844113f9f54d13c2c7edd7c5dc051eb8f547aeae8215ed542e46320636587a2d4fa69e547020effbb35
25872573
languageName: node
25882574
linkType: hard
25892575

2590-
"@fortawesome/fontawesome-svg-core@npm:^1.2.32":
2591-
version: 1.3.0
2592-
resolution: "@fortawesome/fontawesome-svg-core@npm:1.3.0"
2593-
dependencies:
2594-
"@fortawesome/fontawesome-common-types": "npm:^0.3.0"
2595-
checksum: 10/06b3e05fa19700286e99c0da904d837b28aa00de61379a1fffb9b219566dae7b61df71959877c179cd57b4008dc1bf45294a9d87782cc5c1f15a1022cc930931
2596-
languageName: node
2597-
linkType: hard
2598-
2599-
"@fortawesome/free-solid-svg-icons@npm:^5.15.1":
2600-
version: 5.15.4
2601-
resolution: "@fortawesome/free-solid-svg-icons@npm:5.15.4"
2602-
dependencies:
2603-
"@fortawesome/fontawesome-common-types": "npm:^0.2.36"
2604-
checksum: 10/2fae46291b6fbf1c6be90d2f088d23a5c0046ed29befd8c3326550637de629fb6bcebce7e4394c0bed06a08eb5a63af4a6d3333c5e84b6409cb82e4c1165f07e
2605-
languageName: node
2606-
linkType: hard
2607-
2608-
"@fortawesome/vue-fontawesome@npm:^3.0.0-2":
2609-
version: 3.0.6
2610-
resolution: "@fortawesome/vue-fontawesome@npm:3.0.6"
2611-
peerDependencies:
2612-
"@fortawesome/fontawesome-svg-core": ~1 || ~6
2613-
vue: ">= 3.0.0 < 4"
2614-
checksum: 10/26e78c067d52c5fd314706b34cac84c13be707b27ec36a278e42c5c3eb3f98ca952c594de699757b55f628b44a2daa2672977c92c91849823063ccecb85a87c6
2615-
languageName: node
2616-
linkType: hard
2617-
26182576
"@funken-studio/sitemap-nuxt-3@npm:^4.0.4":
26192577
version: 4.0.4
26202578
resolution: "@funken-studio/sitemap-nuxt-3@npm:4.0.4"
@@ -7523,7 +7481,7 @@ __metadata:
75237481
languageName: node
75247482
linkType: hard
75257483

7526-
"@types/node@npm:^18.0.0, @types/node@npm:^18.19.121":
7484+
"@types/node@npm:^18.0.0":
75277485
version: 18.19.121
75287486
resolution: "@types/node@npm:18.19.121"
75297487
dependencies:
@@ -11887,11 +11845,11 @@ __metadata:
1188711845
version: 0.0.0-use.local
1188811846
resolution: "create-vuestic@workspace:packages/create-vuestic"
1188911847
dependencies:
11890-
"@types/node": "npm:^18.19.121"
11848+
"@types/node": "npm:22.12.0"
1189111849
"@types/prompts": "npm:^2.4.2"
1189211850
chalk: "npm:^5.6.2"
1189311851
ora: "npm:^9.3.0"
11894-
pathe: "npm:2.0.3"
11852+
pathe: "npm:^2.0.3"
1189511853
prompts: "npm:^2.4.2"
1189611854
tsup: "npm:^8.5.1"
1189711855
tsx: "npm:^4.21.0"
@@ -21592,20 +21550,20 @@ __metadata:
2159221550
languageName: node
2159321551
linkType: hard
2159421552

21595-
"pathe@npm:2.0.3, pathe@npm:^2.0.0, pathe@npm:^2.0.1, pathe@npm:^2.0.2, pathe@npm:^2.0.3":
21596-
version: 2.0.3
21597-
resolution: "pathe@npm:2.0.3"
21598-
checksum: 10/01e9a69928f39087d96e1751ce7d6d50da8c39abf9a12e0ac2389c42c83bc76f78c45a475bd9026a02e6a6f79be63acc75667df855862fe567d99a00a540d23d
21599-
languageName: node
21600-
linkType: hard
21601-
2160221553
"pathe@npm:^1.1.0, pathe@npm:^1.1.1, pathe@npm:^1.1.2":
2160321554
version: 1.1.2
2160421555
resolution: "pathe@npm:1.1.2"
2160521556
checksum: 10/f201d796351bf7433d147b92c20eb154a4e0ea83512017bf4ec4e492a5d6e738fb45798be4259a61aa81270179fce11026f6ff0d3fa04173041de044defe9d80
2160621557
languageName: node
2160721558
linkType: hard
2160821559

21560+
"pathe@npm:^2.0.0, pathe@npm:^2.0.1, pathe@npm:^2.0.2, pathe@npm:^2.0.3":
21561+
version: 2.0.3
21562+
resolution: "pathe@npm:2.0.3"
21563+
checksum: 10/01e9a69928f39087d96e1751ce7d6d50da8c39abf9a12e0ac2389c42c83bc76f78c45a475bd9026a02e6a6f79be63acc75667df855862fe567d99a00a540d23d
21564+
languageName: node
21565+
linkType: hard
21566+
2160921567
"peek-stream@npm:^1.1.0":
2161021568
version: 1.1.3
2161121569
resolution: "peek-stream@npm:1.1.3"
@@ -23960,9 +23918,9 @@ __metadata:
2396023918
languageName: unknown
2396123919
linkType: soft
2396223920

23963-
"sass@npm:1.89.0":
23964-
version: 1.89.0
23965-
resolution: "sass@npm:1.89.0"
23921+
"sass@npm:^1.97.3":
23922+
version: 1.97.3
23923+
resolution: "sass@npm:1.97.3"
2396623924
dependencies:
2396723925
"@parcel/watcher": "npm:^2.4.1"
2396823926
chokidar: "npm:^4.0.0"
@@ -23973,7 +23931,7 @@ __metadata:
2397323931
optional: true
2397423932
bin:
2397523933
sass: sass.js
23976-
checksum: 10/e8a5ce1a011fbbb20b454bd7db9d28527baae157c2a583c3ff68ca52f4fe97cec9a4ec18811e6509ef4199349286dce3c24c02a3536000d6e6107778f870435f
23934+
checksum: 10/707ef8e525ed32d375e737346140d4b675f44de208df996c2df3407f5e62f3f38226ea1faf41a9fd4b068201e67b3a7e152b9e9c3b098daa847dd480c735f038
2397723935
languageName: node
2397823936
linkType: hard
2397923937

@@ -27878,15 +27836,9 @@ __metadata:
2787827836
version: 0.0.0-use.local
2787927837
resolution: "vuestic-ui@workspace:packages/ui"
2788027838
dependencies:
27881-
"@babel/core": "npm:^7.12.3"
27882-
"@babel/plugin-transform-modules-commonjs": "npm:^7.12.1"
27883-
"@babel/preset-env": "npm:^7.12.1"
2788427839
"@faker-js/faker": "npm:^8.0.2"
2788527840
"@floating-ui/vue": "npm:^1.1.8"
2788627841
"@fortawesome/fontawesome-free": "npm:^6.1.1"
27887-
"@fortawesome/fontawesome-svg-core": "npm:^1.2.32"
27888-
"@fortawesome/free-solid-svg-icons": "npm:^5.15.1"
27889-
"@fortawesome/vue-fontawesome": "npm:^3.0.0-2"
2789027842
"@storybook/addon-essentials": "npm:^7.1.0"
2789127843
"@storybook/addon-interactions": "npm:^7.1.0"
2789227844
"@storybook/addon-links": "npm:^7.1.0"

0 commit comments

Comments
 (0)