Skip to content

Commit

Permalink
fixed formatting errors and jsonc defaultformatter
Browse files Browse the repository at this point in the history
  • Loading branch information
mimarz committed Dec 12, 2024
1 parent c2e57cc commit 2e36900
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 31 deletions.
7 changes: 6 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
"source.organizeImports.biome": "explicit"
},
"editor.defaultFormatter": "biomejs.biome",
"css.customData": ["./.vscode/css-data.json"],
"css.customData": [
"./.vscode/css-data.json"
],
"[css]": {
"editor.defaultFormatter": "biomejs.biome"
},
Expand All @@ -24,5 +26,8 @@
},
"[html]": {
"editor.defaultFormatter": "biomejs.biome"
},
"[jsonc]": {
"editor.defaultFormatter": "biomejs.biome"
}
}
11 changes: 2 additions & 9 deletions apps/_components/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,9 @@
"noEmit": false,
"incremental": true,
"moduleResolution": "Bundler",
"types": [
"@digdir/designsystemet-theme/colors.d.ts",
"./declarations.d.ts",
],
"types": ["@digdir/designsystemet-theme/colors.d.ts", "./declarations.d.ts"]
},
"include": [
"./src",
"./stories",
"declarations.d.ts"
],
"include": ["./src", "./stories", "declarations.d.ts"],
"plugins": [
{
"name": "next"
Expand Down
26 changes: 6 additions & 20 deletions apps/storefront/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,11 @@
"compilerOptions": {
"baseUrl": ".",
"paths": {
"@components": [
"components"
],
"@layouts": [
"layouts"
],
"@blog": [
"app/bloggen/_components"
]
"@components": ["components"],
"@layouts": ["layouts"],
"@blog": ["app/bloggen/_components"]
},
"lib": [
"dom",
"dom.iterable",
"esnext"
],
"lib": ["dom", "dom.iterable", "esnext"],
"allowJs": true,
"skipLibCheck": true,
"strict": true,
Expand All @@ -30,9 +20,7 @@
"jsx": "preserve",
"incremental": true,
"forceConsistentCasingInFileNames": true,
"types": [
"@digdir/designsystemet-theme/colors.d.ts",
],
"types": ["@digdir/designsystemet-theme/colors.d.ts"],
"plugins": [
{
"name": "next"
Expand All @@ -46,7 +34,5 @@
"**/*.css",
".next/types/**/*.ts"
],
"exclude": [
"node_modules"
]
"exclude": ["node_modules"]
}
5 changes: 4 additions & 1 deletion plugins/figma/src/ui/pages/Theme/Theme.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ import { Link as RouterLink, useParams } from 'react-router-dom';

import { getDummyTheme } from '@common/dummyTheme';
import { colorCliOptions } from '@digdir/designsystemet';
import { type CssColor, generateThemeForColor } from '@digdir/designsystemet/color';
import {
type CssColor,
generateThemeForColor,
} from '@digdir/designsystemet/color';
import { type ColorTheme, useThemeStore } from '../../../common/store';
import { themeToFigmaFormat } from '../../../common/utils';
import classes from './Theme.module.css';
Expand Down

0 comments on commit 2e36900

Please sign in to comment.