Skip to content

Commit 149d10d

Browse files
Sweet4everSweet4ever
committed
Merge branch 'main' into textarea
2 parents 2a64807 + 952dbe2 commit 149d10d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+3149
-1399
lines changed

.changeset/twenty-towns-hear.md renamed to .changeset/chatty-kings-tan.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
"@scouterna/ui-webc": minor
44
---
55

6-
Added List View component.
6+
Added list view subheader

‎.changeset/quick-heads-double.md‎

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

‎.changeset/stale-kings-sin.md‎

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

‎.github/workflows/code-quality.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Code quality
2+
3+
on:
4+
push:
5+
pull_request:
6+
7+
jobs:
8+
quality:
9+
runs-on: ubuntu-latest
10+
permissions:
11+
contents: read
12+
steps:
13+
- name: Checkout
14+
uses: actions/checkout@v6
15+
with:
16+
persist-credentials: false
17+
- name: Setup Biome
18+
uses: biomejs/setup-biome@v2
19+
- name: Run Biome
20+
run: biome ci --error-on-warnings .

‎.vscode/settings.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"files.associations": {
33
"*.css": "css" // Avoid CSS files being detected as Tailwind-flavored CSS
4-
}
4+
},
5+
"editor.defaultFormatter": "biomejs.biome"
56
}

‎biome.json‎

Lines changed: 59 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,60 @@
11
{
2-
"$schema": "https://biomejs.dev/schemas/2.2.0/schema.json",
3-
"vcs": {
4-
"enabled": false,
5-
"clientKind": "git",
6-
"useIgnoreFile": false
7-
},
8-
"files": {
9-
"ignoreUnknown": false
10-
},
11-
"formatter": {
12-
"enabled": true,
13-
"indentStyle": "space"
14-
},
15-
"linter": {
16-
"enabled": true,
17-
"rules": {
18-
"recommended": true,
19-
"correctness": {
20-
"noUnusedImports": "off"
21-
}
22-
}
23-
},
24-
"javascript": {
25-
"formatter": {
26-
"quoteStyle": "double"
27-
}
28-
},
29-
"assist": {
30-
"enabled": true,
31-
"actions": {
32-
"source": {
33-
"organizeImports": "on"
34-
}
35-
}
36-
},
37-
"overrides": [
38-
{
39-
"includes": [
40-
"**/*.astro"
41-
],
42-
"linter": {
43-
"rules": {
44-
"style": {
45-
"useConst": "off",
46-
"useImportType": "off"
47-
},
48-
"correctness": {
49-
"noUnusedVariables": "off",
50-
"noUnusedImports": "off"
51-
}
52-
}
53-
}
54-
}
55-
]
56-
}
2+
"$schema": "https://biomejs.dev/schemas/2.3.8/schema.json",
3+
"vcs": {
4+
"enabled": true,
5+
"clientKind": "git",
6+
"useIgnoreFile": true
7+
},
8+
"files": {
9+
"ignoreUnknown": false,
10+
"includes": [
11+
"**",
12+
"!packages/design-tokens/tokens/**/*",
13+
"!packages/ui-webc/src/components.d.ts",
14+
"!packages/ui-react/lib/components/stencil-generated/**/*"
15+
]
16+
},
17+
"formatter": {
18+
"enabled": true,
19+
"indentStyle": "space"
20+
},
21+
"linter": {
22+
"enabled": true,
23+
"rules": {
24+
"recommended": true,
25+
"correctness": {
26+
"noUnusedImports": "off"
27+
}
28+
}
29+
},
30+
"javascript": {
31+
"formatter": {
32+
"quoteStyle": "double"
33+
}
34+
},
35+
"assist": {
36+
"enabled": true,
37+
"actions": {
38+
"source": {
39+
"organizeImports": "on"
40+
}
41+
}
42+
},
43+
"overrides": [
44+
{
45+
"includes": ["**/*.astro"],
46+
"linter": {
47+
"rules": {
48+
"style": {
49+
"useConst": "off",
50+
"useImportType": "off"
51+
},
52+
"correctness": {
53+
"noUnusedVariables": "off",
54+
"noUnusedImports": "off"
55+
}
56+
}
57+
}
58+
}
59+
]
60+
}

‎package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
"changeset": "changeset"
1212
},
1313
"devDependencies": {
14-
"@biomejs/biome": "2.2.0",
15-
"@changesets/changelog-github": "^0.5.1",
16-
"@changesets/cli": "^2.29.7",
17-
"@tailwindcss/postcss": "^4.1.12",
14+
"@biomejs/biome": "2.3.8",
15+
"@changesets/changelog-github": "^0.5.2",
16+
"@changesets/cli": "^2.29.8",
17+
"@tailwindcss/postcss": "^4.1.17",
1818
"@types/lodash.kebabcase": "^4.1.9",
1919
"lodash.kebabcase": "^4.1.1",
2020
"plop": "^4.0.4",
2121
"stencil-tailwind-plugin": "^2.0.5",
22-
"tailwindcss": "^4.1.12"
22+
"tailwindcss": "^4.1.17"
2323
},
24-
"packageManager": "pnpm@10.7.0"
24+
"packageManager": "pnpm@10.24.0"
2525
}

‎packages/design-tokens/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
],
1212
"repository": {
1313
"type": "git",
14-
"url": "https://github.com/Scouterna/j26-web-components.git"
14+
"url": "https://github.com/Scouterna/j26-components.git"
1515
},
1616
"type": "module",
1717
"scripts": {
@@ -20,11 +20,11 @@
2020
"keywords": [],
2121
"author": "",
2222
"license": "UNLICENSED",
23-
"packageManager": "pnpm@10.7.0",
23+
"packageManager": "pnpm@10.24.0",
2424
"devDependencies": {
25-
"style-dictionary": "^5.0.4"
25+
"style-dictionary": "^5.1.1"
2626
},
2727
"dependencies": {
28-
"glob": "^11.0.3"
28+
"glob": "^13.0.0"
2929
}
3030
}

‎packages/storybook/.storybook/main.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ export default defineMain({
2727
},
2828
},
2929
],
30+
esbuild: {
31+
minifyIdentifiers: false,
32+
keepNames: true,
33+
},
3034
} satisfies UserConfig);
3135
},
3236
staticDirs: ["../public"],

‎packages/storybook/.storybook/vitest.setup.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as a11yAddonAnnotations from "@storybook/addon-a11y/preview";
2-
import { setProjectAnnotations } from '@storybook/react-vite';
3-
import * as projectAnnotations from './preview';
2+
import { setProjectAnnotations } from "@storybook/react-vite";
3+
import * as projectAnnotations from "./preview";
44

55
// This is an important step to apply the right configuration when testing your stories.
66
// More info at: https://storybook.js.org/docs/api/portable-stories/portable-stories-vitest#setprojectannotations
7-
setProjectAnnotations([a11yAddonAnnotations, projectAnnotations]);
7+
setProjectAnnotations([a11yAddonAnnotations, projectAnnotations]);

0 commit comments

Comments
 (0)