Skip to content
This repository was archived by the owner on Sep 25, 2025. It is now read-only.

Commit 8f69038

Browse files
BarbapapazesBarbapapazes
committed
Merge branch 'main' into feat/table
2 parents 3316d81 + 517fcd3 commit 8f69038

File tree

10 files changed

+966
-262
lines changed

10 files changed

+966
-262
lines changed

‎package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"type": "module",
33
"private": true,
4-
"packageManager": "pnpm@10.9.0",
4+
"packageManager": "pnpm@10.10.0",
55
"scripts": {
66
"test": "vitest",
77
"lint": "eslint .",
@@ -28,26 +28,26 @@
2828
"ohash": "^2.0.11",
2929
"reka-ui": "^2.2.0",
3030
"tailwind-variants": "^1.0.0",
31-
"tailwindcss": "^4.1.4",
31+
"tailwindcss": "^4.1.5",
3232
"vue": "^3.5.13",
3333
"vue-component-type-helpers": "^2.2.10"
3434
},
3535
"devDependencies": {
3636
"@antfu/eslint-config": "^4.12.0",
37-
"@babel/types": "^7.27.0",
37+
"@babel/types": "^7.27.1",
3838
"@egoist/tailwindcss-icons": "^1.9.0",
3939
"@iconify-json/lucide": "^1.2.39",
40-
"@tailwindcss/vite": "^4.1.4",
40+
"@tailwindcss/vite": "^4.1.5",
4141
"@tsconfig/node22": "^22.0.1",
4242
"@types/md5": "^2.3.5",
43-
"@types/node": "^22.14.1",
43+
"@types/node": "^22.15.3",
4444
"@vue/tsconfig": "^0.7.0",
45-
"eslint": "^9.25.1",
45+
"eslint": "^9.26.0",
4646
"magicast": "^0.3.5",
4747
"md5": "^2.3.0",
4848
"scule": "^1.3.0",
4949
"simple-git": "^3.27.0",
50-
"taze": "^18.7.1",
50+
"taze": "^19.0.4",
5151
"typescript": "^5.8.3",
5252
"ufo": "^1.6.1",
5353
"unplugin-vue-components": "^28.5.0",

‎packages/.vitepress/config.mts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,10 @@ export default defineConfig({
136136
})),
137137
],
138138
},
139+
{
140+
text: 'Icons',
141+
link: '/base-components/icons/',
142+
},
139143
],
140144
'/app-components/': [],
141145
},

‎packages/.vitepress/plugins/markdown-transform.ts‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,20 @@ ${cleanedTestCodeInertia}
127127
}
128128
}
129129

130+
if (/icons/.test(id)) {
131+
const fileName = getFileName(id)
132+
const file = getFile(id, fileName, 'ts')
133+
134+
return {
135+
code: `${code}
136+
137+
\`\`\`ts
138+
${file}
139+
\`\`\`
140+
`,
141+
}
142+
}
143+
130144
if (/utils|types|keys|composables|theme/.test(id)) {
131145
return generateDoc(id, code)
132146
}

‎packages/.vitepress/theme/components/AsideOutlineAfter.vue‎

Lines changed: 33 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ import { computed } from 'vue'
66
const route = useRoute()
77
88
const show = computed(() => {
9-
if (route.path.match(/components\/\w+/)) {
9+
if (route.path.match(/\/components\/\w+/)) {
1010
return true
1111
}
1212
13-
if (route.path.match(/composables\/\w+/)) {
13+
if (route.path.match(/\/composables\/\w+/)) {
1414
return true
1515
}
1616
17-
if (route.path.match(/keys\/\w+/)) {
17+
if (route.path.match(/\/keys\/\w+/)) {
1818
return true
1919
}
2020
@@ -41,24 +41,37 @@ const openIssue = computed(() => {
4141
</script>
4242

4343
<template>
44-
<div v-if="show" class="mt-6 pt-6 border-t border-dashed border-(--vp-c-divider)">
45-
<div role="heading" aria-level="2" class="font-semibold text-sm ml-4 leading-8">
46-
Contribute
47-
</div>
44+
<template v-if="show">
45+
<AsideOutlineAfterSection>
46+
<AsideOutlineAfterHeading title="Contribute" />
4847

49-
<a :href="viewComponent" target="_blank" class="flex flex-row items-center text-(--vp-c-text-2)! text-sm transition-colors duration-[250ms] leading-8 hover:text-(--vp-c-text-1)!">
50-
<span class="i-simple-icons-github mr-2 size-4" />
51-
View on GitHub
52-
</a>
48+
<AsideOutlineAfterLink
49+
:href="viewComponent"
50+
label="View Component"
51+
icon="i-simple-icons-github"
52+
/>
5353

54-
<a :href="openIssue" target="_blank" class="flex flex-row items-center text-(--vp-c-text-2)! text-sm transition-colors duration-[250ms] leading-8 hover:text-(--vp-c-text-1)!">
55-
<span class="i-lucide-message-square mr-2 size-4" />
56-
Open an issue
57-
</a>
54+
<AsideOutlineAfterLink
55+
:href="openIssue"
56+
label="Open an issue"
57+
icon="i-lucide-message-square"
58+
/>
5859

59-
<a :href="editComponent" target="_blank" class="flex flex-row items-center text-(--vp-c-text-2)! text-sm transition-colors duration-[250ms] leading-8 hover:text-(--vp-c-text-1)!">
60-
<span class="i-lucide-pen mr-2 size-4" />
61-
Edit the component
62-
</a>
63-
</div>
60+
<AsideOutlineAfterLink
61+
:href="editComponent"
62+
label="Edit the component"
63+
icon="i-lucide-pen"
64+
/>
65+
</AsideOutlineAfterSection>
66+
67+
<AsideOutlineAfterSection>
68+
<AsideOutlineAfterHeading title="Special Thanks" />
69+
70+
<AsideOutlineAfterLink
71+
href="https://ui.nuxt.com"
72+
label="Nuxt UI"
73+
icon="i-simple-icons-nuxtdotjs"
74+
/>
75+
</AsideOutlineAfterSection>
76+
</template>
6477
</template>

‎packages/.vitepress/theme/components/AsideOutlineAfterHeading.vue‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<script lang="ts" setup>
2+
interface Props {
3+
title: string
4+
}
5+
const props = defineProps<Props>()
6+
</script>
7+
8+
<template>
9+
<div role="heading" aria-level="2" class="font-semibold text-sm ml-4 leading-8">
10+
{{ props.title }}
11+
</div>
12+
</template>

‎packages/.vitepress/theme/components/AsideOutlineAfterLink.vue‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<script lang="ts" setup>
2+
interface Props {
3+
href: string
4+
label: string
5+
icon: string
6+
}
7+
const props = defineProps<Props>()
8+
</script>
9+
10+
<template>
11+
<a :href="props.href" target="_blank" class="flex flex-row items-center text-(--vp-c-text-2)! text-sm transition-colors duration-[250ms] leading-8 hover:text-(--vp-c-text-1)!">
12+
<span :class="props.icon" class="mr-2 size-4" />
13+
{{ props.label }}
14+
</a>
15+
</template>

‎packages/.vitepress/theme/components/AsideOutlineAfterSection.vue‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<script lang="ts" setup>
2+
interface Slots {
3+
default: (props?: any) => void
4+
}
5+
defineSlots<Slots>()
6+
</script>
7+
8+
<template>
9+
<div class="mt-6 pt-6 border-t border-dashed border-(--vp-c-divider)">
10+
<slot />
11+
</div>
12+
</template>

‎packages/base-components/icons/index.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Icons
2+
3+
All the icons used in the components.

‎packages/base-components/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
"reka-ui": "^2.2.0",
2727
"scule": "^1.3.0",
2828
"tailwind-variants": "^1.0.0",
29-
"tailwindcss": "^4.1.4",
29+
"tailwindcss": "^4.1.5",
3030
"vue": "^3.5.13",
3131
"vue-component-type-helpers": "^2.2.10"
3232
},
3333
"devDependencies": {
34-
"@tailwindcss/vite": "^4.1.4",
34+
"@tailwindcss/vite": "^4.1.5",
3535
"@testing-library/vue": "^8.1.0",
3636
"@vitejs/plugin-vue": "^5.2.3",
3737
"@vitest/ui": "^3.1.2",

0 commit comments

Comments
 (0)