Skip to content

feat(app): add the shadcn + tailwind design-system layer #2386

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DeliciousBuding merged 1 commit into from
Oct 19, 2026
Merged

feat(app): add the shadcn + tailwind design-system layer #2386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/desktop/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
"@storybook/addon-interactions": "^8.6.14",
"@storybook/react": "^8.6.18",
"@storybook/react-vite": "^8.6.18",
"@tailwindcss/vite": "^4.3.3",
"@tauri-apps/cli": "^2.11.4",
"@testing-library/jest-dom": "^6.9.1",
"@testing-library/react": "^16.3.2",
Expand All @@ -72,6 +73,7 @@
"playwright": "^1.60.0",
"rollup-plugin-visualizer": "^7.0.1",
"storybook": "^8.6.18",
"tailwindcss": "^4.3.3",
"typescript": "~5.8.0",
"typescript-eslint": "^8.59.4",
"vite": "^6.4.3",
Expand Down
1 change: 1 addition & 0 deletions app/desktop/src/main.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { AppShell } from '@/AppShell';
import '@/styles/tokens.css';
import '@/styles/themes.css';
import '@/styles/presets.css';
import '@shared/styles/shadcn.css';

const root = document.getElementById('root');
if (!root) {
Expand Down
3 changes: 2 additions & 1 deletion app/desktop/vite.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { defineConfig, type Plugin } from 'vite';
import react from '@vitejs/plugin-react';
import tailwindcss from '@tailwindcss/vite';
import fs from 'fs';
import os from 'os';
import path from 'path';
Expand Down Expand Up @@ -75,7 +76,7 @@ export default defineConfig({
define: {
__APP_VERSION__: JSON.stringify(packageJson.version),
},
plugins: [react(), edgeAuthTokenPlugin(), devCspPlugin()],
plugins: [react(), tailwindcss(), edgeAuthTokenPlugin(), devCspPlugin()],
resolve: {
dedupe: ['react', 'react-dom'],
alias: {
Expand Down
2 changes: 2 additions & 0 deletions app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
"devDependencies": {
"@eslint/js": "^10.0.1",
"@playwright/test": "^1.60.0",
"@tailwindcss/vite": "^4.3.3",
"@testing-library/dom": "^10.4.1",
"@testing-library/jest-dom": "^6.9.1",
"@testing-library/react": "^16.3.2",
Expand All @@ -51,6 +52,7 @@
"jsdom": "^29.1.1",
"rollup-plugin-visualizer": "^7.0.1",
"stylelint": "^16.21.0",
"tailwindcss": "^4.3.3",
"typescript-eslint": "^8.59.4",
"vitest": "^4.1.10"
},
Expand Down
Loading
Loading