Skip to content

Commit

Permalink
Merge pull request #1042 from 3YOURMIND/bump-prettier
Browse files Browse the repository at this point in the history
dx(prettier): bump to latest
  • Loading branch information
Isokaeder authored Jan 17, 2025
2 parents 5bc5897 + 8e609f1 commit 2f6d41e
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 17 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"nodemon": "^3.0.3",
"postcss": "^8.4.38",
"postcss-html": "^1.6.0",
"prettier": "^3.2.5",
"prettier": "^3.4.2",
"publint": "^0.2.7",
"stylelint": "^15.11.0",
"stylelint-config-recess-order": "^4.3.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1394,7 +1394,7 @@ export default defineComponent({
autoComplete:
settings.value.autoComplete === 'token'
? settings.value.autoCompleteToken
: settings.value.autoComplete ?? undefined,
: (settings.value.autoComplete ?? undefined),
})
if (
Expand Down
2 changes: 1 addition & 1 deletion packages/kotti-ui/source/kotti-button/KtButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export default defineComponent({
appendTo: () => document.body,
arrow: false,
content: props.helpText
? helpTextContentRef.value ?? undefined
? (helpTextContentRef.value ?? undefined)
: undefined,
interactive: true,
offset: [0, TIPPY_DISTANCE_OFFSET],
Expand Down
5 changes: 3 additions & 2 deletions packages/kotti-ui/source/kotti-field-date/mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -234,8 +234,9 @@
&:not(.disabled) {
&:not(.in-range) {
@supports (
clip-path:
circle(calc(#{$td-diameter * 0.5} + 2px) at center)
clip-path: circle(
calc(#{$td-diameter * 0.5} + 2px) at center
)
) {
clip-path: circle(
calc(#{$td-diameter * 0.5} + 2px) at center
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ export default defineComponent({
const fieldPlaceholder = computed(() =>
props.isReadonly
? null
: props.placeholder ?? translations.value.placeholder,
: (props.placeholder ?? translations.value.placeholder),
)
const setFieldValue = (newValue: KottiFieldInlineEdit.Value) => {
Expand Down Expand Up @@ -254,7 +254,7 @@ export default defineComponent({
} => ({
...modifiedField.inputProps,
forceUpdateKey: forceUpdateKey.value,
placeholder: isEditing.value ? '' : fieldPlaceholder.value ?? '',
placeholder: isEditing.value ? '' : (fieldPlaceholder.value ?? ''),
readonly: props.isReadonly,
value: modifiedField.currentValue ?? '',
}),
Expand Down
4 changes: 2 additions & 2 deletions packages/kotti-ui/source/kotti-field-number/KtFieldNumber.vue
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ export default defineComponent({
field.currentValue === null
? canFallbackToZero.value
? 0
: props.minimum ?? props.maximum ?? 0
: (props.minimum ?? props.maximum ?? 0)
: Big(field.currentValue).minus(props.step).toNumber(),
)
focusInput()
Expand All @@ -243,7 +243,7 @@ export default defineComponent({
field.currentValue === null
? canFallbackToZero.value
? 0
: props.minimum ?? props.maximum ?? 0
: (props.minimum ?? props.maximum ?? 0)
: Big(field.currentValue).add(props.step).toNumber(),
)
focusInput()
Expand Down
4 changes: 2 additions & 2 deletions packages/kotti-ui/source/kotti-style/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ $red-500: #d91919;

$base-font-family: -apple-system, 'BlinkMacSystemFont', 'Segoe UI', 'Roboto',
'Helvetica', 'Arial', 'sans-serif' !default;
$mono-font-family: 'SF Mono', 'Segoe UI Mono', 'Roboto Mono', 'Menlo', 'Courier',
'monospace' !default;
$mono-font-family: 'SF Mono', 'Segoe UI Mono', 'Roboto Mono', 'Menlo',
'Courier', 'monospace' !default;
$fallback-font-family: 'Helvetica Neue', 'sans-serif' !default;
$cjk-zh-font-family: $base-font-family, 'PingFang SC', 'Hiragino Sans GB',
'Microsoft YaHei', $fallback-font-family !default;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ export const pluralize = (
count === 0
? cases[0]
: count === 1
? cases[1] ?? cases[0]
: cases[2] ?? cases[1] ?? cases[0]
? (cases[1] ?? cases[0])
: (cases[2] ?? cases[1] ?? cases[0])
) as string

Object.entries(values).forEach(([key, value]) => {
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -13752,10 +13752,10 @@ prettier-linter-helpers@^1.0.0:
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==

prettier@^3.2.5:
version "3.2.5"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.2.5.tgz#e52bc3090586e824964a8813b09aba6233b28368"
integrity sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==
prettier@^3.4.2:
version "3.4.2"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.4.2.tgz#a5ce1fb522a588bf2b78ca44c6e6fe5aa5a2b13f"
integrity sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==

pretty-bytes@^5.6.0:
version "5.6.0"
Expand Down

0 comments on commit 2f6d41e

Please sign in to comment.