Skip to content

Commit 1f3c473

Browse files
authored
Merge branch 'next' into changeset-release/next
2 parents 9e4065f + 6959e9d commit 1f3c473

File tree

330 files changed

+2182
-8760
lines changed

Some content is hidden

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

330 files changed

+2182
-8760
lines changed

.changeset/config.json

+6-3
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,13 @@
1111
"baseBranch": "main",
1212
"updateInternalDependencies": "patch",
1313
"ignore": [
14-
"@digdir/design-system-react",
15-
"storefront",
14+
"dev",
1615
"theme",
16+
"storefront",
17+
"@repo/components",
18+
"@designsystemet/storybook",
19+
"@digdir/design-system-react",
1720
"figma-plugin",
18-
"@digdir/components"
21+
"@digdir/create-tokens"
1922
]
2023
}

.changeset/pre.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"mode": "pre",
33
"tag": "next",
44
"initialVersions": {
5-
"@digdir/components": "0.0.0",
5+
"@repo/components": "0.0.0",
66
"dev": "0.1.0",
77
"storefront": "0.1.0",
88
"theme": "0.1.0",

.changeset/tender-ties-swim.md

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@digdir/designsystemet-react': patch
3+
'@digdir/designsystemet': patch
4+
---
5+
6+
Changed linter and formatter from eslint to biomejs

.eslintignore

-7
This file was deleted.

.eslintrc.cjs

-99
This file was deleted.
+3-11
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
1-
name: Checks Storefront
1+
name: Build Storefront
22
on:
33
workflow_dispatch:
44
pull_request:
55
paths:
66
- 'apps/storefront/**'
7-
push:
8-
paths:
9-
- 'apps/storefront/**'
107
jobs:
118
checks:
12-
name: Builds, lints and tests code
9+
name: Build & test
1310
runs-on: ubuntu-latest
1411
steps:
1512
- name: Checkout repository
@@ -27,9 +24,4 @@ jobs:
2724
run: yarn build:storefront
2825
- name: Types
2926
run: yarn types:storefront
30-
- name: Lint Code
31-
run: yarn lint ./apps/storefront
32-
- name: Lint CSS
33-
run: yarn lint-style ./apps/storefront/**/*.css
34-
- name: Test
35-
run: yarn test
27+

.github/workflows/checks-packages.yml

+2-10
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
1-
name: Checks Packages
1+
name: Build Packages
22
on:
33
workflow_dispatch:
44
pull_request:
55
paths:
66
- 'packages/**'
7-
- '*.*js'
8-
push:
9-
paths:
10-
- 'packages/**'
117
jobs:
128
checks:
13-
name: Builds, lints and tests code
9+
name: Build & test
1410
runs-on: ubuntu-latest
1511
steps:
1612
- uses: actions/checkout@v4
@@ -19,9 +15,5 @@ jobs:
1915
run: yarn build
2016
- name: Types
2117
run: yarn types:react
22-
- name: Lint Code
23-
run: yarn lint:all
24-
- name: Lint CSS
25-
run: yarn lint-style
2618
- name: Test
2719
run: yarn test

.github/workflows/checks.yml

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Checks
2+
on:
3+
workflow_dispatch:
4+
pull_request:
5+
paths:
6+
- 'packages/**'
7+
- 'apps/**'
8+
- 'biome.jsonc'
9+
jobs:
10+
checks:
11+
name: Lint
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/checkout@v4
15+
- uses: ./.github/actions/gh-setup
16+
- name: Biome CI
17+
run: yarn biome ci .
18+
- name: Lint CSS
19+
run: yarn lint-style
20+

.vscode/extensions.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"recommendations": [
3-
"dbaeumer.vscode-eslint",
43
"esbenp.prettier-vscode",
54
"unifiedjs.vscode-mdx",
65
"christian-kohler.npm-intellisense",
@@ -22,6 +21,7 @@
2221
"editorconfig.editorconfig",
2322
"zignd.html-css-class-completion",
2423
"streetsidesoftware.code-spell-checker",
25-
"streetsidesoftware.code-spell-checker-norwegian-bokmal"
24+
"streetsidesoftware.code-spell-checker-norwegian-bokmal",
25+
"biomejs.biome"
2626
]
2727
}

.vscode/settings.json

+9-19
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
{
22
"git.rebaseWhenSync": true,
33
"git.autofetch": true,
4-
"editor.defaultFormatter": "esbenp.prettier-vscode",
54
"editor.formatOnSave": true,
5+
"editor.codeActionsOnSave": {
6+
"quickfix.biome": "explicit",
7+
"source.organizeImports.biome": "explicit"
8+
},
9+
"editor.defaultFormatter": "biomejs.biome",
10+
"[css]": {
11+
"editor.defaultFormatter": "esbenp.prettier-vscode"
12+
},
613
"prettier.prettierPath": "./node_modules/prettier",
714
"typescript.tsdk": "node_modules/typescript/lib",
815
"typescript.enablePromptUseWorkspaceTsdk": true,
@@ -11,22 +18,5 @@
1118
"packages/theme/brand/digdir/typography/primary.css",
1219
"packages/theme/brand/digdir/semantic.css"
1320
],
14-
"[ignore]": {
15-
"editor.defaultFormatter": "foxundermoon.shell-format"
16-
},
17-
"eslint.probe": [
18-
"javascript",
19-
"javascriptreact",
20-
"typescript",
21-
"typescriptreact",
22-
"html",
23-
"vue",
24-
"markdown",
25-
"mdx"
26-
],
27-
"html-css-class-completion.includeGlobPattern": "packages/css/**/*.{css,html}",
28-
"cSpell.words": ["altinn", "brreg", "designsystemet", "digdir"],
29-
"cSpell.language": "en,nb",
30-
"cSpell.ignorePaths": ["**/node_modules/**", "**/package.json", "yarn.lock"],
31-
"cSpell.enabledLanguageIds": ["markdown", "plaintext"]
21+
"html-css-class-completion.includeGlobPattern": "packages/css/**/*.{css,html}"
3222
}

0 commit comments

Comments
 (0)