Skip to content

Commit

Permalink
Merge pull request #273 from PRIME-TU-Delft/Update-shadcn
Browse files Browse the repository at this point in the history
Update shadcn
  • Loading branch information
yustarandomname authored Nov 23, 2024
2 parents abdf148 + 4a980c1 commit cf289e5
Show file tree
Hide file tree
Showing 97 changed files with 1,015 additions and 1,133 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/docker-build-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ jobs:
push: true
tags: ghcr.io/${{ env.OWNER_LOWERCASE }}/interactive-visuals-web:latest

# - name: Build and push (docs)
# uses: docker/build-push-action@v3
# with:
# file: 'Dockerfile-docs'
# push: true
# tags: ghcr.io/${{ env.OWNER_LOWERCASE }}/interactive-visuals-docs:latest
- name: Build and push (docs)
uses: docker/build-push-action@v3
with:
file: 'Dockerfile-docs'
push: true
tags: ghcr.io/${{ env.OWNER_LOWERCASE }}/interactive-visuals-docs:latest
11 changes: 7 additions & 4 deletions components.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
{
"$schema": "https://shadcn-svelte.com/schema.json",
"style": "default",
"$schema": "https://next.shadcn-svelte.com/schema.json",
"style": "new-york",
"tailwind": {
"config": "tailwind.config.js",
"css": "src/app.css",
"baseColor": "slate"
},
"aliases": {
"components": "$lib/components",
"utils": "$lib/utils/shadcn-utils"
"utils": "$lib/utils/shadcn-utils",
"ui": "$lib/components/ui",
"hooks": "$lib/hooks"
},
"typescript": true
"typescript": true,
"registry": "https://next.shadcn-svelte.com/registry"
}
11 changes: 11 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,16 @@ export default ts.config(

'src/lib/components/ui/'
]
},
{
rules: {
'@typescript-eslint/no-unused-vars': [
'warn',
{
argsIgnorePattern: '^_',
varsIgnorePattern: '^\\$\\$(Props|Events|Slots|Generic)$'
}
]
}
}
);
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,22 @@
"@types/katex": "^0.16.7",
"@types/three": "^0.170.0",
"autoprefixer": "^10.4.20",
"bits-ui": "1.0.0-next.64",
"clsx": "^2.1.1",
"eslint": "^9.7.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-svelte": "^2.36.0",
"globals": "^15.0.0",
"lucide-svelte": "^0.456.0",
"prettier": "^3.3.2",
"prettier-plugin-svelte": "^3.2.6",
"storybook": "^8.4.2",
"svelte": "^5.0.0",
"svelte-check": "^4.0.0",
"tailwind-merge": "^2.5.4",
"tailwind-variants": "^0.3.0",
"tailwindcss": "^3.4.9",
"tailwindcss-animate": "^1.0.7",
"typescript": "^5.0.0",
"typescript-eslint": "^8.0.0",
"vite": "^5.0.3"
Expand All @@ -53,18 +59,12 @@
"@sveltejs/adapter-node": "^5.2.9",
"@threlte/core": "8.0.0-next.30",
"@threlte/extras": "9.0.0-next.39",
"bits-ui": "^0.21.16",
"clsx": "^2.1.1",
"cmdk-sv": "^0.0.18",
"d3": "^7.9.0",
"formsnap": "^1.0.1",
"katex": "^0.16.11",
"lucide-svelte": "^0.456.0",
"screenfull": "^6.0.2",
"svelte-confetti": "^2.1.2",
"sveltekit-superforms": "^2.20.0",
"tailwind-merge": "^2.5.4",
"tailwind-variants": "^0.3.0",
"three": "^0.170.0",
"zod": "^3.23.8"
}
Expand Down
Loading

0 comments on commit cf289e5

Please sign in to comment.