Skip to content

Commit 8e92f1b

Browse files
authored
Use new design-core package (#10548)
* chore(ui): remove Terrazzo design tokens, config, and docs to stop generating CSS and simplify repo * update tokens usage in UI package * chore: update design-core ref, add core workspace, and adjust font paths and metadata * update design-core usage for all packages * update design-core import * chore: pin @gitbutler/design-core to v1.0.3 instead of Git URL to ensure stable dev dependency resolution
1 parent fae1383 commit 8e92f1b

30 files changed

+34
-5029
lines changed

.github/pr-labeler.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,3 @@ rust:
1919
'@gitbutler/no-relative-imports':
2020
- changed-files:
2121
- any-glob-to-any-file: packages/no-relative-imports/**/*
22-
23-
'@gitbutler/design-tokens':
24-
- changed-files:
25-
- any-glob-to-any-file: packages/design-tokens/**/*

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,6 @@ storybook-static
6464
# Claude
6565
.swarm
6666
.claude-flow
67+
68+
# Auto-generated design tokens
69+
packages/ui/src/styles/tokens.css

apps/desktop/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
},
2525
"devDependencies": {
2626
"@anthropic-ai/sdk": "^0.59.0",
27+
"@gitbutler/design-core": "^1.0.3",
2728
"@gitbutler/core": "workspace:*",
2829
"@gitbutler/shared": "workspace:*",
2930
"@gitbutler/svelte-comment-injector": "workspace:*",

apps/desktop/src/routes/+layout.svelte

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<script lang="ts">
2+
import '@gitbutler/design-core/tokens';
3+
import '@gitbutler/design-core/fonts';
24
import '../styles/styles.css';
35
import { browser, dev } from '$app/environment';
46
import { afterNavigate, beforeNavigate } from '$app/navigation';

apps/web/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
},
1616
"devDependencies": {
1717
"@csstools/postcss-global-data": "^3.0.0",
18+
"@gitbutler/design-core": "^1.0.3",
1819
"@gitbutler/core": "workspace:*",
1920
"@gitbutler/shared": "workspace:*",
2021
"@gitbutler/ui": "workspace:*",

apps/web/src/routes/+layout.svelte

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
import { WebRoutesService, WEB_ROUTES_SERVICE } from '@gitbutler/shared/routing/webRoutes.svelte';
1717
import { type Snippet } from 'svelte';
1818
import { get } from 'svelte/store';
19+
import '@gitbutler/design-core/tokens';
20+
import '@gitbutler/design-core/fonts';
1921
import '$lib/styles/global.css';
2022
2123
interface Props {

packages/ui/.storybook/preview.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import type { Preview } from '@storybook/sveltekit';
2+
import '@gitbutler/design-core/tokens';
3+
import '@gitbutler/design-core/fonts';
24
import '../src/styles/main.css';
3-
import '../src/styles/fonts/fonts.css';
45
import './stories-styles.css';
56

67
const preview: Preview = {

packages/ui/package.json

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
"dev:package:styles": "postcss ./src/styles/main.css -o ./dist/styles/main.css --watch",
1818
"package": "pnpm run --sequential \"/^package:.*/\"",
1919
"package:svelte": "svelte-kit sync && svelte-package",
20-
"package:styles": "postcss ./src/styles/main.css -o ./dist/styles/main.css && npm run package:fonts",
21-
"package:fonts": "cp -r ./src/styles/fonts ./dist/styles/",
22-
"design-tokens:build": "npx tz build && prettier --write ./src/lib/data/design-tokens.json ./src/styles/core/design-tokens.css",
20+
"package:styles": "postcss ./src/styles/main.css -o ./dist/styles/main.css",
2321
"prepublishOnly": "pnpm run package",
2422
"prepare": "svelte-kit sync",
2523
"storybook": "storybook dev --no-open -p 6006",
@@ -45,7 +43,6 @@
4543
"@codemirror/language": "^6.11.2",
4644
"@codemirror/legacy-modes": "^6.5.1",
4745
"@csstools/postcss-bundler": "^2.0.8",
48-
"@gitbutler/core": "workspace:*",
4946
"@lezer/common": "^1.2.3",
5047
"@lezer/highlight": "^1.2.1",
5148
"@replit/codemirror-lang-svelte": "^6.0.0",
@@ -59,9 +56,6 @@
5956
"@sveltejs/kit": "catalog:svelte",
6057
"@sveltejs/package": "catalog:svelte",
6158
"@sveltejs/vite-plugin-svelte": "catalog:svelte",
62-
"@terrazzo/cli": "0.6.0",
63-
"@terrazzo/parser": "0.6.0",
64-
"@terrazzo/plugin-css": "0.6.0",
6559
"@types/diff-match-patch": "^1.0.36",
6660
"@types/postcss-pxtorem": "^6.1.0",
6761
"@vitest/browser": "catalog:",
@@ -82,7 +76,8 @@
8276
"svelte": "catalog:svelte",
8377
"svelte-check": "catalog:svelte",
8478
"vite": "catalog:",
85-
"vitest": "catalog:"
79+
"vitest": "catalog:",
80+
"@gitbutler/design-core": "^1.0.3"
8681
},
8782
"peerDependencies": {
8883
"svelte": "^4.0.0 || ^5.0.0-0"
@@ -122,6 +117,7 @@
122117
"@giphy/js-fetch-api": "^5.7.0",
123118
"@giphy/js-types": "^5.1.0",
124119
"@giphy/svelte-components": "^1.1.0",
120+
"@gitbutler/core": "workspace:*",
125121
"@lexical/link": "0.27.1",
126122
"@lexical/list": "0.27.1",
127123
"@lexical/markdown": "0.27.1",

0 commit comments

Comments
 (0)