diff --git a/.storybook/README.md b/.storybook/README.md index ba09b24d5..08db988a9 100644 --- a/.storybook/README.md +++ b/.storybook/README.md @@ -226,8 +226,8 @@ In this project, only the `` syntax from unpl ``` diff --git a/lint-staged.config.mjs b/lint-staged.config.mjs deleted file mode 100644 index 6f74d6616..000000000 --- a/lint-staged.config.mjs +++ /dev/null @@ -1,24 +0,0 @@ -import path from 'node:path' - -export default { - 'tests-ui/**': () => - 'echo "Files in tests-ui/ are deprecated. Colocate tests with source files." && exit 1', - - './**/*.js': (stagedFiles) => formatAndEslint(stagedFiles), - - './**/*.{ts,tsx,vue,mts}': (stagedFiles) => [ - ...formatAndEslint(stagedFiles), - 'pnpm typecheck' - ] -} - -function formatAndEslint(fileNames) { - // Convert absolute paths to relative paths for better ESLint resolution - const relativePaths = fileNames.map((f) => path.relative(process.cwd(), f)) - const joinedPaths = relativePaths.map((p) => `"${p}"`).join(' ') - return [ - `pnpm exec oxfmt ${joinedPaths}`, - `pnpm exec oxlint --fix ${joinedPaths}`, - `pnpm exec eslint --cache --fix --no-warn-ignored ${joinedPaths}` - ] -} diff --git a/lint-staged.config.ts b/lint-staged.config.ts index 89deaa4b0..3ea9358fa 100644 --- a/lint-staged.config.ts +++ b/lint-staged.config.ts @@ -1,6 +1,9 @@ import path from 'node:path' export default { + 'tests-ui/**': () => + 'echo "Files in tests-ui/ are deprecated. Colocate tests with source files." && exit 1', + './**/*.js': (stagedFiles: string[]) => formatAndEslint(stagedFiles), './**/*.{ts,tsx,vue,mts}': (stagedFiles: string[]) => [ @@ -14,7 +17,7 @@ function formatAndEslint(fileNames: string[]) { const relativePaths = fileNames.map((f) => path.relative(process.cwd(), f)) const joinedPaths = relativePaths.map((p) => `"${p}"`).join(' ') return [ - `pnpm exec prettier --cache --write ${joinedPaths}`, + `pnpm exec oxfmt ${joinedPaths}`, `pnpm exec oxlint --fix ${joinedPaths}`, `pnpm exec eslint --cache --fix --no-warn-ignored ${joinedPaths}` ] diff --git a/src/components/LiteGraphCanvasSplitterOverlay.vue b/src/components/LiteGraphCanvasSplitterOverlay.vue index 4a7695d18..a0a8a0cf5 100644 --- a/src/components/LiteGraphCanvasSplitterOverlay.vue +++ b/src/components/LiteGraphCanvasSplitterOverlay.vue @@ -1,6 +1,6 @@ @@ -233,7 +233,7 @@ onUpdated(() => { } :deep(.p-breadcrumb-item) { - @apply flex items-center overflow-hidden h-8; + @apply flex h-8 items-center overflow-hidden; min-width: calc(var(--p-breadcrumb-item-min-width) + 1rem); border: 1px solid transparent; background-color: transparent; diff --git a/src/components/breadcrumb/SubgraphBreadcrumbItem.vue b/src/components/breadcrumb/SubgraphBreadcrumbItem.vue index 0edcc25f9..499ee7cd4 100644 --- a/src/components/breadcrumb/SubgraphBreadcrumbItem.vue +++ b/src/components/breadcrumb/SubgraphBreadcrumbItem.vue @@ -21,8 +21,15 @@ class="icon-[lucide--triangle-alert] text-warning-background" /> {{ item.label }} - - + + - + diff --git a/src/components/card/CardBottom.vue b/src/components/card/CardBottom.vue index 4a0ae1047..502d08bce 100644 --- a/src/components/card/CardBottom.vue +++ b/src/components/card/CardBottom.vue @@ -1,6 +1,6 @@ @@ -14,6 +14,6 @@ const { fullHeight = true } = defineProps<{ }>() const containerClasses = computed(() => - cn('flex-1 w-full', fullHeight && 'h-full') + cn('w-full flex-1', fullHeight && 'h-full') ) diff --git a/src/components/card/CardContainer.vue b/src/components/card/CardContainer.vue index 8b8f81944..0b9e8fa5c 100644 --- a/src/components/card/CardContainer.vue +++ b/src/components/card/CardContainer.vue @@ -1,7 +1,7 @@ @@ -59,7 +59,7 @@ const containerClasses = computed(() => { outline: cn( hasBorder && 'border-2 border-border-subtle', hasCursor && 'cursor-pointer', - 'hover:border-border-subtle/50 transition-colors' + 'transition-colors hover:border-border-subtle/50' ) } diff --git a/src/components/chip/SquareChip.vue b/src/components/chip/SquareChip.vue index b31e283db..0f19eb3fb 100644 --- a/src/components/chip/SquareChip.vue +++ b/src/components/chip/SquareChip.vue @@ -1,6 +1,6 @@ @@ -19,9 +19,9 @@ const baseClasses = const variantStyles = { dark: 'bg-zinc-500/40 text-white/90', - light: cn('backdrop-blur-[2px] bg-base-background/50 text-base-foreground'), + light: cn('bg-base-background/50 text-base-foreground backdrop-blur-[2px]'), gray: cn( - 'backdrop-blur-[2px] bg-modal-card-tag-background text-base-foreground' + 'bg-modal-card-tag-background text-base-foreground backdrop-blur-[2px]' ) } diff --git a/src/components/common/OverlayIcon.vue b/src/components/common/OverlayIcon.vue index bc68918f0..268c51cfd 100644 --- a/src/components/common/OverlayIcon.vue +++ b/src/components/common/OverlayIcon.vue @@ -1,11 +1,14 @@