Skip to content

Commit 9247ebb

Browse files
Merge pull request #8 from vercel/elliott/upgrade-shadcn-svelte-and-tailwind
feat: Upgrade shadcn-svelte to latest, upgrade Tailwind to v4
2 parents d6e5b6f + 9b546e1 commit 9247ebb

File tree

92 files changed

+1197
-1337
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+1197
-1337
lines changed

components.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
{
2-
"$schema": "https://shadcn-svelte.com/schema.json",
3-
"style": "default",
2+
"$schema": "https://next.shadcn-svelte.com/schema.json",
43
"tailwind": {
5-
"config": "tailwind.config.ts",
64
"css": "src/app.css",
75
"baseColor": "zinc"
86
},
97
"aliases": {
108
"components": "$lib/components",
119
"utils": "$lib/utils/shadcn",
1210
"ui": "$lib/components/ui",
13-
"hooks": "$lib/hooks"
11+
"hooks": "$lib/hooks",
12+
"lib": "$lib"
1413
},
1514
"typescript": true,
1615
"registry": "https://next.shadcn-svelte.com/registry"

eslint.config.js

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,34 @@ import svelte from 'eslint-plugin-svelte';
55
import globals from 'globals';
66
import { fileURLToPath } from 'node:url';
77
import ts from 'typescript-eslint';
8+
import svelteConfig from './svelte.config.js';
9+
810
const gitignorePath = fileURLToPath(new URL('./.gitignore', import.meta.url));
911

1012
export default ts.config(
13+
includeIgnoreFile(gitignorePath),
14+
js.configs.recommended,
15+
...ts.configs.recommended,
16+
...svelte.configs.recommended,
17+
prettier,
18+
...svelte.configs.prettier,
19+
{
20+
languageOptions: {
21+
globals: { ...globals.browser, ...globals.node }
22+
},
23+
rules: { 'no-undef': 'off' }
24+
},
25+
{
26+
files: ['**/*.svelte', '**/*.svelte.ts', '**/*.svelte.js'],
27+
languageOptions: {
28+
parserOptions: {
29+
projectService: true,
30+
extraFileExtensions: ['.svelte'],
31+
parser: ts.parser,
32+
svelteConfig
33+
}
34+
}
35+
},
1136
{
1237
rules: {
1338
'@typescript-eslint/no-unused-vars': [
@@ -23,28 +48,5 @@ export default ts.config(
2348
}
2449
]
2550
}
26-
},
27-
includeIgnoreFile(gitignorePath),
28-
js.configs.recommended,
29-
...ts.configs.recommended,
30-
...svelte.configs['flat/recommended'],
31-
prettier,
32-
...svelte.configs['flat/prettier'],
33-
{
34-
languageOptions: {
35-
globals: {
36-
...globals.browser,
37-
...globals.node
38-
}
39-
}
40-
},
41-
{
42-
files: ['**/*.svelte'],
43-
44-
languageOptions: {
45-
parserOptions: {
46-
parser: ts.parser
47-
}
48-
}
4951
}
5052
);

package.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,45 +26,45 @@
2626
"@ai-sdk/xai": "^1.2.1",
2727
"@eslint/compat": "^1.2.5",
2828
"@eslint/js": "^9.18.0",
29-
"@lucide/svelte": "^0.483.0",
29+
"@internationalized/date": "^3.5.6",
30+
"@lucide/svelte": "^0.511.0",
3031
"@oslojs/crypto": "^1.0.1",
3132
"@oslojs/encoding": "^1.1.0",
3233
"@sejohnson/svelte-themes": "^0.0.6",
3334
"@sveltejs/adapter-vercel": "^5.5.2",
3435
"@sveltejs/kit": "^2.16.0",
3536
"@sveltejs/vite-plugin-svelte": "^5.0.0",
37+
"@tailwindcss/vite": "^4.0.0",
3638
"@types/ms": "^2.1.0",
3739
"@vercel/blob": "^0.27.3",
3840
"ai": "^4.2.0",
3941
"autoprefixer": "^10.4.20",
4042
"bcrypt-ts": "^5.0.3",
41-
"bits-ui": "1.3.4",
43+
"bits-ui": "^2.4.1",
4244
"clsx": "^2.1.1",
4345
"date-fns": "^4.1.0",
4446
"dotenv": "^16.4.7",
4547
"drizzle-kit": "^0.30.4",
4648
"drizzle-orm": "^0.39.3",
4749
"eslint": "^9.18.0",
4850
"eslint-config-prettier": "^10.0.1",
49-
"eslint-plugin-svelte": "^2.46.1",
50-
"globals": "^15.14.0",
51-
"lucide-svelte": "^0.475.0",
52-
"mode-watcher": "^0.5.1",
51+
"eslint-plugin-svelte": "^3.0.0",
52+
"globals": "^16.0.0",
53+
"mode-watcher": "^1.0.7",
5354
"ms": "^2.1.3",
5455
"neverthrow": "^8.1.1",
5556
"postgres": "^3.4.5",
5657
"prettier": "^3.4.2",
5758
"prettier-plugin-svelte": "^3.3.3",
58-
"prettier-plugin-tailwindcss": "^0.6.10",
59-
"shadcn-svelte": "1.0.0-next.4",
60-
"svelte": "^5.20.2",
59+
"prettier-plugin-tailwindcss": "^0.6.11",
60+
"svelte": "^5.33.14",
6161
"svelte-check": "^4.0.0",
6262
"svelte-exmarkdown": "^5.0.0",
63-
"svelte-sonner": "^0.3.28",
64-
"tailwind-merge": "^3.0.1",
65-
"tailwind-variants": "^0.3.1",
66-
"tailwindcss": "^3.4.17",
67-
"tailwindcss-animate": "^1.0.7",
63+
"svelte-sonner": "^1.0.1",
64+
"tailwind-merge": "^3.0.2",
65+
"tailwind-variants": "^1.0.0",
66+
"tailwindcss": "^4.1.8",
67+
"tw-animate-css": "^1.3.4",
6868
"typescript": "^5.0.0",
6969
"typescript-eslint": "^8.20.0",
7070
"vite": "^6.0.0",
@@ -75,5 +75,5 @@
7575
"esbuild"
7676
]
7777
},
78-
"packageManager": "pnpm@9.15.4+sha512.b2dc20e2fc72b3e18848459b37359a32064663e5627a51e4c74b2c29dd8e8e0491483c3abb40789cfd578bf362fb6ba8261b05f0387d76792ed6e23ea3b1b6a0"
78+
"packageManager": "pnpm@10.11.1+sha512.e519b9f7639869dc8d5c3c5dfef73b3f091094b0a006d7317353c72b124e80e1afd429732e28705ad6bfa1ee879c1fce46c128ccebd3192101f43dd67c667912"
7979
}

0 commit comments

Comments
 (0)