Skip to content

Commit cf1b6a2

Browse files
authored
Merge branch 'next' into feat-SER-464-Compound-Tag
2 parents 7c771ee + 7361c25 commit cf1b6a2

File tree

8 files changed

+65
-37
lines changed

8 files changed

+65
-37
lines changed

.github/workflows/tests.yml

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
branches: [main]
66
pull_request:
7-
branches: ["**"]
7+
branches: ['**']
88

99
jobs:
1010
test:
@@ -23,14 +23,16 @@ jobs:
2323
run: pnpm run build
2424
- name: Run Linter
2525
run: pnpm run lint
26-
- name: Run tests
27-
run: |
28-
pnpm dev &
29-
pnpm run test
30-
- uses: actions/upload-artifact@v4
31-
if: ${{ !cancelled() }}
32-
with:
33-
name: genauigkeit-report
34-
path: |
35-
v2/pink-sb/.genauigkeit/report/index.html
36-
retention-days: 30
26+
- name: Run Static Analysis
27+
run: pnpm run check
28+
# - name: Run tests
29+
# run: |
30+
# pnpm dev &
31+
# pnpm run test
32+
# - uses: actions/upload-artifact@v4
33+
# if: ${{ !cancelled() }}
34+
# with:
35+
# name: genauigkeit-report
36+
# path: |
37+
# v2/pink-sb/.genauigkeit/report/index.html
38+
# retention-days: 30

package.json

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
"version": "0.0.0",
55
"type": "module",
66
"scripts": {
7-
"build": "pnpm run -r build",
8-
"dev": "pnpm run -r --parallel --stream dev",
9-
"test": "pnpm run -r test",
10-
"test:generate": "pnpm run -r test:generate",
11-
"format": "pnpm run -r format",
12-
"lint": "pnpm run -r lint",
13-
"check": "pnpm run -r check",
7+
"build": "wsu build",
8+
"dev": "wsu dev",
9+
"test": "wsu run test",
10+
"test:generate": "wsu run test:generate",
11+
"format": "wsu run format",
12+
"lint": "wsu run lint",
13+
"check": "wsu run check",
1414
"pre": "",
1515
"bump": "changeset",
1616
"bump-patch": "",
@@ -20,7 +20,8 @@
2020
"release": "npm run build && changeset publish"
2121
},
2222
"devDependencies": {
23-
"@changesets/cli": "^2.27.12"
23+
"@changesets/cli": "^2.27.12",
24+
"workspace-utils": "^1.0.2"
2425
},
2526
"engines": {
2627
"node": ">=20.0.0"

pnpm-lock.yaml

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

v2/pink-sb/src/lib/action-list/Accordion.svelte

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,3 @@
2020
buttonPadding="--space-6"><slot /></AccordionBase
2121
>
2222
</div>
23-
24-
<style lang="scss">
25-
@use './item';
26-
27-
:global(.action-list-accordion button) {
28-
padding: 0;
29-
display: block;
30-
@include item.base;
31-
}
32-
:global(.action-list-accordion-divider button),
33-
:global(.action-list-accordion-divider .divider) {
34-
margin-bottom: var(--gap-xxxs);
35-
}
36-
</style>

v2/pink-sb/src/lib/spreadsheet/Cell.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@
491491
}
492492
493493
&[data-loading='true'] {
494-
display: inline-flex;
494+
display: flex;
495495
}
496496
497497
&[data-empty-cell='true'] {

v2/pink-sb/src/stories/Avatar.stories.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
name="Image"
3434
args={{ src: 'https://avatars.githubusercontent.com/u/1759475?v=4&size=128' }}
3535
/>
36-
<Story name="Icon">
36+
<Story name="With Icon">
3737
<Avatar>
3838
<Icon icon={IconSvelte} size="s" />
3939
</Avatar>

v2/pink-sb/src/stories/charts/Line.stories.svelte

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
<script>
1212
import { Story, Template } from '@storybook/addon-svelte-csf';
13+
// @ts-expect-error weird json import warning
1314
import data from './data.json';
1415
</script>
1516

v2/pink-sb/vite.config.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,12 @@ import { sveltekit } from '@sveltejs/kit/vite';
22
import { defineConfig } from 'vite';
33

44
export default defineConfig({
5-
plugins: [sveltekit()]
5+
plugins: [sveltekit()],
6+
css: {
7+
preprocessorOptions: {
8+
scss: {
9+
api: 'modern'
10+
}
11+
}
12+
}
613
});

0 commit comments

Comments
 (0)