Skip to content

Commit 987e258

Browse files
committed
Update vite deps, use vite for Storybook, replace jest with vitest
1 parent 0bc0ec9 commit 987e258

20 files changed

+4612
-13742
lines changed

.storybook/main.js

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

.storybook/main.ts

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
import { vanillaExtractPlugin } from '@vanilla-extract/vite-plugin';
2+
import type { StorybookConfig } from '@storybook/html-vite';
3+
import { defaultClientConditions, defaultServerConditions } from 'vite';
4+
5+
export default {
6+
stories: ['../packages/**/*.stories.@(ts|tsx)'],
7+
framework: '@storybook/html-vite',
8+
core: {
9+
builder: '@storybook/builder-vite',
10+
},
11+
viteFinal: (config) => {
12+
config.plugins ??= [];
13+
config.plugins.push(vanillaExtractPlugin());
14+
15+
config.resolve = {
16+
// Tell Vite to load workspace packages directly from the source TypeScript files.
17+
conditions: ['@capsizecss/src', ...defaultClientConditions],
18+
};
19+
20+
config.ssr ??= {};
21+
config.ssr.resolve = {
22+
// Tell Vite to load workspace packages directly from the source TypeScript files.
23+
conditions: ['@capsizecss/src', ...defaultServerConditions],
24+
};
25+
26+
return config;
27+
},
28+
} satisfies StorybookConfig;

babel.config.js

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

jest.config.js

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

package.json

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@
77
"%packages": "pnpm --filter='@capsizecss/*' --aggregate-output",
88
"%site": "pnpm --filter=./site",
99
"start": "pnpm site:start",
10-
"test": "jest",
10+
"test": "vitest run",
1111
"format": "prettier --write .",
1212
"lint": "manypkg check && prettier --check . && tsc",
13-
"dev": "pnpm unpack:generate && pnpm %packages dev && pnpm metrics:generate",
13+
"dev": "pnpm unpack:generate && pnpm metrics:generate",
1414
"build": "pnpm %packages build && pnpm generate",
1515
"generate": "pnpm unpack:generate && pnpm metrics:generate",
1616
"copy-readme": "node scripts/copy-readme",
1717
"version": "changeset version && pnpm install --lockfile-only",
1818
"prepare-release": "pnpm copy-readme && pnpm build",
1919
"release": "pnpm prepare-release && pnpm site:build && pnpm site:deploy && changeset publish",
2020
"chromatic": "chromatic",
21-
"storybook": "start-storybook --quiet --port 6006",
22-
"storybook:build": "build-storybook",
21+
"storybook": "storybook dev --quiet --port 6006",
22+
"storybook:build": "pnpm build && storybook build",
2323
"site:start": "pnpm %site start",
2424
"site:build": "pnpm %site build",
2525
"site:serve": "pnpm %site serve",
@@ -45,24 +45,21 @@
4545
"@changesets/changelog-github": "^0.5.0",
4646
"@changesets/cli": "^2.27.1",
4747
"@manypkg/cli": "^0.21.4",
48-
"@storybook/addon-viewport": "^6.5.16",
49-
"@storybook/builder-webpack5": "^6.5.16",
50-
"@storybook/cli": "^6.5.16",
51-
"@storybook/html": "^6.5.16",
52-
"@storybook/manager-webpack5": "^6.5.16",
53-
"@types/jest": "^29.5.11",
48+
"@storybook/builder-vite": "^10.0.7",
49+
"@storybook/html-vite": "^10.0.7",
5450
"@types/node": "^22.18.8",
55-
"@vanilla-extract/webpack-plugin": "^2.3.4",
51+
"@vanilla-extract/vite-plugin": "^5.1.1",
5652
"chromatic": "^11.3.0",
5753
"husky": "^8.0.3",
5854
"is-ci": "^3.0.1",
59-
"jest": "^29.7.0",
6055
"prettier": "^3.6.2",
6156
"react": "^18.2.0",
6257
"react-dom": "^18.2.0",
58+
"storybook": "^10.0.7",
6359
"tsdown": "^0.16.1",
64-
"typescript": "^5.3.3",
65-
"webpack": "^5.90.0"
60+
"typescript": "^5.9.3",
61+
"vite": "^7.2.2",
62+
"vitest": "^4.0.9"
6663
},
6764
"packageManager": "pnpm@9.6.0",
6865
"volta": {

packages/core/src/createFontStack.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { describe, expect, it } from 'vitest';
12
import {
23
createFontStack,
34
quoteIfNeeded,

packages/core/src/createStyleObject.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { describe, expect, it } from 'vitest';
12
import { createStyleObject } from './createStyleObject';
23

34
const fontMetrics = {

packages/core/src/createStyleString.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { describe, expect, it } from 'vitest';
12
import { createStyleString } from './createStyleString';
23

34
describe('createStyleString', () => {

packages/core/src/getCapHeight.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { describe, expect, it } from 'vitest';
12
import { getCapHeight } from './';
23

34
describe('getCapHeight', () => {

packages/core/src/precomputeValues.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { describe, expect, it } from 'vitest';
12
import { precomputeValues } from './';
23

34
describe('precomputeValues', () => {

0 commit comments

Comments
 (0)