Skip to content

Commit a486458

Browse files
committed
Merge branch 'main' into publish
2 parents 7ec6052 + 2bdcd85 commit a486458

File tree

10 files changed

+1168
-4494
lines changed

10 files changed

+1168
-4494
lines changed

.github/workflows/publish-storybook.yml

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,16 @@ jobs:
2121
- name: Checkout
2222
uses: actions/checkout@v4
2323

24-
- name: Setup pnpm
25-
uses: pnpm/action-setup@v4
24+
- name: Setup Bun
25+
uses: oven-sh/setup-bun@v2
2626
with:
27-
version: 10
28-
29-
- name: Setup Node.js
30-
uses: actions/setup-node@v4
31-
with:
32-
node-version: 22
33-
cache: "pnpm"
27+
bun-version: latest
3428

3529
- name: Install dependencies
36-
run: pnpm install
30+
run: bun install
3731

3832
- name: Build Storybook
39-
run: pnpm --filter @xray/ui storybook:build
33+
run: bun run --filter @xray/ui storybook:build
4034

4135
- name: Setup Pages
4236
uses: actions/configure-pages@v5

.npmrc

Lines changed: 0 additions & 17 deletions
This file was deleted.

.prototools

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
pnpm = "~10"
2-
node = "~25"
1+
bun = "~1.3"
32

43
[settings]
54
auto-install = true

bun.lock

Lines changed: 1128 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,32 @@
44
"private": true,
55
"type": "module",
66
"description": "xray monorepo",
7+
"workspaces": [
8+
"packages/*"
9+
],
10+
"catalog": {
11+
"@types/node": "25.0.2",
12+
"@vitest/ui": "^4.0.15",
13+
"eslint": "^9.17.0",
14+
"prettier": "^3.7.4",
15+
"solid-js": "1.9.10",
16+
"typescript": "^5.7.2",
17+
"vite": "^7.3.0",
18+
"vitest": "4.0.15",
19+
"zod": "^4.2.0"
20+
},
721
"engines": {
8-
"node": ">=25.0.0",
9-
"pnpm": ">=10.0.0"
22+
"bun": ">=1.3.0"
1023
},
1124
"scripts": {
12-
"build": "pnpm -r build",
13-
"dev": "pnpm -r --parallel dev",
14-
"test": "pnpm -r test",
15-
"lint": "pnpm -r lint",
16-
"typecheck": "pnpm -r typecheck",
17-
"clean": "pnpm -r clean && rm -rf node_modules",
18-
"format": "prettier --write \"**/*.{ts,tsx,js,jsx,json,md,mdx,css}\"",
19-
"schema:generate": "pnpm -r schema:generate"
25+
"build": "bun run --filter '*' build",
26+
"dev": "bun run --filter '*' dev",
27+
"test": "bun run --filter '*' test",
28+
"lint": "bun run --filter '*' lint",
29+
"typecheck": "bun run --filter '*' typecheck",
30+
"clean": "bun run --filter '*' clean && rm -rf node_modules",
31+
"format": "bunx prettier --write \"**/*.{ts,tsx,js,jsx,json,md,mdx,css}\"",
32+
"schema:generate": "bun run --filter '*' schema:generate"
2033
},
2134
"keywords": [],
2235
"author": "",

packages/schema/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,14 @@
1919
"build": "tsc",
2020
"clean": "rm -rf dist",
2121
"dev": "tsc --watch",
22-
"schema:generate": "tsx src/scripts/generate-schema.ts",
22+
"schema:generate": "bun src/scripts/generate-schema.ts",
2323
"test": "vitest",
2424
"test:ui": "vitest --ui",
2525
"typecheck": "tsc --noEmit"
2626
},
2727
"devDependencies": {
2828
"@types/node": "catalog:",
2929
"@vitest/ui": "catalog:",
30-
"tsx": "^4.21.0",
3130
"typescript": "catalog:",
3231
"vitest": "catalog:"
3332
},

packages/ui/src/components/ColorSwatch/ColorSwatch.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@
158158
border-radius: 4px;
159159
font-size: 10px;
160160
font-weight: 600;
161-
text-transform: uppercase;
162161
letter-spacing: 0.5px;
163162
width: fit-content;
164163
}

packages/ui/src/components/ColorSwatch/ColorSwatch.stories.tsx

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ export const Default = meta.story({
2424

2525
// sRGB gamut colors (will always display normally)
2626
export const SRGBColor = meta.story({
27+
name: "sRGB Color",
2728
args: {
2829
color: "rgb(100, 149, 237)",
2930
},
@@ -43,6 +44,7 @@ export const HSLColor = meta.story({
4344

4445
// P3 gamut colors (will show split view on sRGB displays)
4546
export const P3Color = meta.story({
47+
name: "P3 Color",
4648
args: {
4749
color: "color(display-p3 1 0.2 0.1)",
4850
},
@@ -57,6 +59,7 @@ export const P3Color = meta.story({
5759
});
5860

5961
export const P3VibrantGreen = meta.story({
62+
name: "P3 Vibrant Green",
6063
args: {
6164
color: "color(display-p3 0.2 1 0.2)",
6265
},
@@ -70,13 +73,15 @@ export const P3VibrantGreen = meta.story({
7073
});
7174

7275
export const P3VibrantCyan = meta.story({
76+
name: "P3 Vibrant Cyan",
7377
args: {
7478
color: "color(display-p3 0 0.9 0.9)",
7579
},
7680
});
7781

7882
// Rec2020 gamut colors (will show split view on sRGB and P3 displays)
7983
export const Rec2020Color = meta.story({
84+
name: "Rec2020 Color",
8085
args: {
8186
color: "color(rec2020 0.9 0.1 0.1)",
8287
},
@@ -91,6 +96,7 @@ export const Rec2020Color = meta.story({
9196
});
9297

9398
export const Rec2020Green = meta.story({
99+
name: "Rec2020 Green",
94100
args: {
95101
color: "color(rec2020 0.3 0.9 0.1)",
96102
},
@@ -136,6 +142,7 @@ export const HexWithAlpha = meta.story({
136142
});
137143

138144
export const P3WithAlpha = meta.story({
145+
name: "P3 With Alpha",
139146
args: {
140147
color: "color(display-p3 1 0.3 0.1 / 0.7)",
141148
},
@@ -165,6 +172,7 @@ export const LargeSize = meta.story({
165172
});
166173

167174
export const LargeP3Color = meta.story({
175+
name: "Large P3 Color",
168176
args: {
169177
color: "color(display-p3 1 0.5 0)",
170178
size: 140,
@@ -222,6 +230,7 @@ export const WideGamut = meta.story({
222230

223231
// Always show fallback examples
224232
export const AlwaysShowFallbackP3 = meta.story({
233+
name: "Always Show Fallback P3",
225234
args: {
226235
color: "color(display-p3 1 0.2 0.1)",
227236
alwaysShowFallback: true,
@@ -253,6 +262,7 @@ export const AlwaysShowFallbackOKLCH = meta.story({
253262
});
254263

255264
export const AlwaysShowFallbackSRGB = meta.story({
265+
name: "Always Show Fallback sRGB",
256266
args: {
257267
color: "#ff6b6b",
258268
alwaysShowFallback: true,

0 commit comments

Comments
 (0)