Skip to content

Commit

Permalink
fix: avoid failing resolve types by adding radix-vue to project dep…
Browse files Browse the repository at this point in the history
…s in `shadcn-vue init` before the `add` command (#216)

* fix: avoid failing resolve types by adding `radix-vue` to project deps in `init` command

* chore: add `shell-emulator` and remove `cross-env`

fix some registry example import path

* chore: remove additional `radix-vue`  dependency from components registry

* chore: update `tsx` and `vue-tsc`

* fix: normalize `components:example` path to process `crawlExample` function correctly

* chore: build registry

---------

Co-authored-by: zernonia <zernonia@gmail.com>
  • Loading branch information
sadeghbarati and zernonia committed Dec 21, 2023
1 parent b40321e commit 010e377
Show file tree
Hide file tree
Showing 67 changed files with 359 additions and 296 deletions.
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
shell-emulator=true
4 changes: 2 additions & 2 deletions apps/www/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@
"rimraf": "^5.0.5",
"tailwind-merge": "^2.0.0",
"tailwindcss": "^3.3.5",
"tsx": "^3.14.0",
"tsx": "^4.7.0",
"typescript": "^5.2.2",
"unplugin-icons": "^0.17.1",
"vite": "^4.5.0",
"vitepress": "^1.0.0-rc.24",
"vue-tsc": "^1.8.22"
"vue-tsc": "^1.8.25"
}
}
5 changes: 2 additions & 3 deletions apps/www/src/lib/registry/registry.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import { readFile, readdir } from 'node:fs/promises'
import { join, resolve } from 'pathe'
import { join, normalize, resolve } from 'pathe'
import { compileScript, parse } from 'vue/compiler-sfc'

import type { Registry } from '../../lib/registry'

const DEPENDENCIES = new Map<string, string[]>([
['radix-vue', []],
['@vueuse/core', []],
['v-calendar', []],
['@tanstack/vue-table', []],
Expand Down Expand Up @@ -67,7 +66,7 @@ async function crawlExample(rootPath: string) {

if (dirent.isFile()) {
const [name] = dirent.name.split('.vue')
const file_path = join('example', dirent.path.split('/example')[1], dirent.name)
const file_path = join('example', normalize(dirent.path).split('/example')[1], dirent.name)
const { dependencies, registryDependencies }
= await getDependencies(join(dirent.path, dirent.name))

Expand Down
117 changes: 29 additions & 88 deletions apps/www/src/public/registry/index.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
[
{
"name": "accordion",
"dependencies": [
"radix-vue"
],
"dependencies": [],
"registryDependencies": [
"utils"
],
Expand Down Expand Up @@ -32,9 +30,7 @@
},
{
"name": "alert-dialog",
"dependencies": [
"radix-vue"
],
"dependencies": [],
"registryDependencies": [
"utils",
"button"
Expand All @@ -55,9 +51,7 @@
},
{
"name": "aspect-ratio",
"dependencies": [
"radix-vue"
],
"dependencies": [],
"registryDependencies": [],
"files": [
"ui/aspect-ratio/AspectRatio.vue",
Expand All @@ -67,9 +61,7 @@
},
{
"name": "avatar",
"dependencies": [
"radix-vue"
],
"dependencies": [],
"registryDependencies": [
"utils"
],
Expand All @@ -95,9 +87,7 @@
},
{
"name": "button",
"dependencies": [
"radix-vue"
],
"dependencies": [],
"registryDependencies": [
"utils"
],
Expand Down Expand Up @@ -142,9 +132,7 @@
},
{
"name": "checkbox",
"dependencies": [
"radix-vue"
],
"dependencies": [],
"registryDependencies": [
"utils"
],
Expand All @@ -156,9 +144,7 @@
},
{
"name": "collapsible",
"dependencies": [
"radix-vue"
],
"dependencies": [],
"registryDependencies": [],
"files": [
"ui/collapsible/Collapsible.vue",
Expand All @@ -170,9 +156,7 @@
},
{
"name": "command",
"dependencies": [
"radix-vue"
],
"dependencies": [],
"registryDependencies": [
"utils",
"dialog"
Expand All @@ -193,9 +177,7 @@
},
{
"name": "context-menu",
"dependencies": [
"radix-vue"
],
"dependencies": [],
"registryDependencies": [
"utils"
],
Expand All @@ -221,9 +203,7 @@
},
{
"name": "dialog",
"dependencies": [
"radix-vue"
],
"dependencies": [],
"registryDependencies": [
"utils"
],
Expand All @@ -242,9 +222,7 @@
},
{
"name": "dropdown-menu",
"dependencies": [
"radix-vue"
],
"dependencies": [],
"registryDependencies": [
"utils"
],
Expand All @@ -270,7 +248,6 @@
{
"name": "form",
"dependencies": [
"radix-vue",
"vee-validate",
"@vee-validate/zod",
"zod"
Expand All @@ -291,9 +268,7 @@
},
{
"name": "hover-card",
"dependencies": [
"radix-vue"
],
"dependencies": [],
"registryDependencies": [
"utils"
],
Expand Down Expand Up @@ -321,9 +296,7 @@
},
{
"name": "label",
"dependencies": [
"radix-vue"
],
"dependencies": [],
"registryDependencies": [
"utils"
],
Expand All @@ -335,9 +308,7 @@
},
{
"name": "menubar",
"dependencies": [
"radix-vue"
],
"dependencies": [],
"registryDependencies": [
"utils"
],
Expand All @@ -363,9 +334,7 @@
},
{
"name": "navigation-menu",
"dependencies": [
"radix-vue"
],
"dependencies": [],
"registryDependencies": [
"utils"
],
Expand All @@ -384,9 +353,7 @@
},
{
"name": "pagination",
"dependencies": [
"radix-vue"
],
"dependencies": [],
"registryDependencies": [
"utils",
"button"
Expand All @@ -403,9 +370,7 @@
},
{
"name": "popover",
"dependencies": [
"radix-vue"
],
"dependencies": [],
"registryDependencies": [
"utils"
],
Expand All @@ -419,9 +384,7 @@
},
{
"name": "progress",
"dependencies": [
"radix-vue"
],
"dependencies": [],
"registryDependencies": [
"utils"
],
Expand All @@ -433,9 +396,7 @@
},
{
"name": "radio-group",
"dependencies": [
"radix-vue"
],
"dependencies": [],
"registryDependencies": [
"utils"
],
Expand All @@ -448,9 +409,7 @@
},
{
"name": "scroll-area",
"dependencies": [
"radix-vue"
],
"dependencies": [],
"registryDependencies": [
"utils"
],
Expand All @@ -463,9 +422,7 @@
},
{
"name": "select",
"dependencies": [
"radix-vue"
],
"dependencies": [],
"registryDependencies": [
"utils"
],
Expand All @@ -485,9 +442,7 @@
},
{
"name": "separator",
"dependencies": [
"radix-vue"
],
"dependencies": [],
"registryDependencies": [
"utils"
],
Expand All @@ -499,9 +454,7 @@
},
{
"name": "sheet",
"dependencies": [
"radix-vue"
],
"dependencies": [],
"registryDependencies": [
"utils"
],
Expand Down Expand Up @@ -532,9 +485,7 @@
},
{
"name": "slider",
"dependencies": [
"radix-vue"
],
"dependencies": [],
"registryDependencies": [
"utils"
],
Expand All @@ -546,9 +497,7 @@
},
{
"name": "switch",
"dependencies": [
"radix-vue"
],
"dependencies": [],
"registryDependencies": [
"utils"
],
Expand Down Expand Up @@ -580,9 +529,7 @@
},
{
"name": "tabs",
"dependencies": [
"radix-vue"
],
"dependencies": [],
"registryDependencies": [
"utils"
],
Expand Down Expand Up @@ -611,9 +558,7 @@
},
{
"name": "toast",
"dependencies": [
"radix-vue"
],
"dependencies": [],
"registryDependencies": [
"utils"
],
Expand All @@ -633,9 +578,7 @@
},
{
"name": "toggle",
"dependencies": [
"radix-vue"
],
"dependencies": [],
"registryDependencies": [
"utils"
],
Expand All @@ -647,9 +590,7 @@
},
{
"name": "tooltip",
"dependencies": [
"radix-vue"
],
"dependencies": [],
"registryDependencies": [
"utils"
],
Expand Down
4 changes: 1 addition & 3 deletions apps/www/src/public/registry/styles/default/accordion.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{
"name": "accordion",
"dependencies": [
"radix-vue"
],
"dependencies": [],
"registryDependencies": [
"utils"
],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{
"name": "alert-dialog",
"dependencies": [
"radix-vue"
],
"dependencies": [],
"registryDependencies": [
"utils",
"button"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{
"name": "aspect-ratio",
"dependencies": [
"radix-vue"
],
"dependencies": [],
"registryDependencies": [],
"files": [
{
Expand Down
Loading

0 comments on commit 010e377

Please sign in to comment.