diff --git a/.oxfmtrc.json b/.oxfmtrc.json index 5ffd11314766..5d8248473e09 100644 --- a/.oxfmtrc.json +++ b/.oxfmtrc.json @@ -16,8 +16,27 @@ "coverage", "*.md" ], - "experimentalTailwindcss": { - "stylesheet": "./frontend/src/styles/tailwind.css", - "functions": ["cn"] - } + "overrides": [ + { + "files": ["**/*.tsx"], + "options": { + "experimentalTailwindcss": { + "stylesheet": "./frontend/src/styles/tailwind.css", + "attributes": ["cn"], + "functions": ["cn"] + }, + "experimentalSortImports": { + "groups": [ + ["side-effect"], + ["builtin"], + ["external", "external-type"], + ["internal", "internal-type"], + ["parent", "parent-type"], + ["sibling", "sibling-type"], + ["index", "index-type"] + ] + } + } + } + ] } diff --git a/backend/package.json b/backend/package.json index 69eba1c1356b..7427efe98d69 100644 --- a/backend/package.json +++ b/backend/package.json @@ -80,8 +80,8 @@ "@vitest/coverage-v8": "4.0.15", "concurrently": "8.2.2", "openapi3-ts": "2.0.2", - "oxlint": "1.39.0", - "oxlint-tsgolint": "0.11.0", + "oxlint": "1.40.0", + "oxlint-tsgolint": "0.11.1", "readline-sync": "1.4.10", "supertest": "7.1.4", "testcontainers": "11.11.0", diff --git a/frontend/__tests__/components/AnimatedModal.spec.tsx b/frontend/__tests__/components/AnimatedModal.spec.tsx index 0237e8ffb20e..354cdf0f997c 100644 --- a/frontend/__tests__/components/AnimatedModal.spec.tsx +++ b/frontend/__tests__/components/AnimatedModal.spec.tsx @@ -1,5 +1,6 @@ -import { describe, it, expect, vi, beforeEach } from "vitest"; import { render } from "@solidjs/testing-library"; +import { describe, it, expect, vi, beforeEach } from "vitest"; + import { AnimatedModal } from "../../src/ts/components/common/AnimatedModal"; describe("AnimatedModal", () => { diff --git a/frontend/__tests__/components/AsyncContent.spec.tsx b/frontend/__tests__/components/AsyncContent.spec.tsx index 613dd48d2851..0147be215dd3 100644 --- a/frontend/__tests__/components/AsyncContent.spec.tsx +++ b/frontend/__tests__/components/AsyncContent.spec.tsx @@ -1,6 +1,7 @@ -import { describe, it, expect } from "vitest"; import { render, screen, waitFor } from "@solidjs/testing-library"; import { createResource, Resource } from "solid-js"; +import { describe, it, expect } from "vitest"; + import AsyncContent from "../../src/ts/components/common/AsyncContent"; describe("AsyncContent", () => { diff --git a/frontend/__tests__/components/Button.spec.tsx b/frontend/__tests__/components/Button.spec.tsx index 5475867747c1..7f18597dfbee 100644 --- a/frontend/__tests__/components/Button.spec.tsx +++ b/frontend/__tests__/components/Button.spec.tsx @@ -1,5 +1,6 @@ -import { describe, it, expect, vi, afterEach } from "vitest"; import { render, cleanup } from "@solidjs/testing-library"; +import { describe, it, expect, vi, afterEach } from "vitest"; + import { Button } from "../../src/ts/components/common/Button"; describe("Button component", () => { diff --git a/frontend/__tests__/components/ScrollToTop.spec.tsx b/frontend/__tests__/components/ScrollToTop.spec.tsx index b7c4dc545c13..27a46015f451 100644 --- a/frontend/__tests__/components/ScrollToTop.spec.tsx +++ b/frontend/__tests__/components/ScrollToTop.spec.tsx @@ -1,6 +1,7 @@ -import { describe, it, expect, vi, beforeEach } from "vitest"; import { render } from "@solidjs/testing-library"; import { userEvent } from "@testing-library/user-event"; +import { describe, it, expect, vi, beforeEach } from "vitest"; + import { ScrollToTop } from "../../src/ts/components/layout/footer/ScrollToTop"; import * as CoreSignals from "../../src/ts/signals/core"; diff --git a/frontend/package.json b/frontend/package.json index 8e8d55784cdc..3d7999b67043 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -90,8 +90,8 @@ "madge": "8.0.0", "magic-string": "0.30.17", "normalize.css": "8.0.1", - "oxlint": "1.39.0", - "oxlint-tsgolint": "0.11.0", + "oxlint": "1.40.0", + "oxlint-tsgolint": "0.11.1", "postcss": "8.4.31", "sass": "1.70.0", "solid-js": "1.9.10", diff --git a/frontend/src/index.html b/frontend/src/index.html index bfe7dd8ca2e1..bd0cff291cdd 100644 --- a/frontend/src/index.html +++ b/frontend/src/index.html @@ -7,7 +7,6 @@
-