diff --git a/oxlint.config.ts b/oxlint.config.ts index 360d1fa..8ea1298 100644 --- a/oxlint.config.ts +++ b/oxlint.config.ts @@ -1,14 +1,24 @@ +import createBase from "@concertypin/config/oxlint"; import createFrontendOxlintConfig from "@concertypin/config/oxlint/frontend"; import { defineConfig } from "oxlint"; import reactConfig from "./scripts/linter/oxlint-react.ts"; +const frontend = createFrontendOxlintConfig({ + tailwind: { entryPoint: "src/index.css" }, +}); + export default defineConfig({ - jsPlugins: ["oxlint-tailwindcss"], - plugins: ["typescript", "unicorn", "import", "vitest", "promise", "react"], + plugins: ["react"], env: { builtin: true, }, + options: { + denyWarnings: true, + typeAware: true, + typeCheck: true, + reportUnusedDisableDirectives: "error", + }, ignorePatterns: [ "**/node_modules/**", "**/dist/**", @@ -18,12 +28,6 @@ export default defineConfig({ "**/.vscode/**", "**/.git/**", ], - options: { - denyWarnings: true, - reportUnusedDisableDirectives: "error", - typeAware: true, - typeCheck: true, - }, - settings: { tailwindcss: { entryPoint: "src/index.css" } }, - extends: [createFrontendOxlintConfig("src/index.css"), reactConfig], + settings: frontend.settings, + extends: [createBase(), frontend, reactConfig], }); diff --git a/package.json b/package.json index ce62769..95a6962 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "react-router-dom": "^7.18.4" }, "devDependencies": { - "@concertypin/config": "^0.4.0", + "@concertypin/config": "^0.5.0", "@tailwindcss/postcss": "^4.3.3", "@testing-library/dom": "^10.4.2", "@testing-library/jest-dom": "^7.0.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0fa2790..ece8df3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -177,8 +177,8 @@ importers: version: 7.18.4(react-dom@19.3.0(react@19.3.0))(react@19.3.0) devDependencies: '@concertypin/config': - specifier: ^0.4.0 - version: 0.4.0(oxfmt@0.72.0)(oxlint@1.87.0(oxlint-tsgolint@7.0.2003)) + specifier: ^0.5.0 + version: 0.5.0(oxfmt@0.72.0)(oxlint-tsgolint@7.0.2003)(oxlint@1.87.0(oxlint-tsgolint@7.0.2003)) '@tailwindcss/postcss': specifier: ^4.3.3 version: 4.3.3 @@ -293,12 +293,16 @@ packages: resolution: {integrity: sha512-0GEz8qJWokkUVYQYRukmkSHIFNoBH8QTreeHrAFbvz1XFYc3Y+puhMs8PQ5x8GNugiC2l5jvDBXKLbBIByeSBw==} hasBin: true - '@concertypin/config@0.4.0': - resolution: {integrity: sha512-BlRhQv1qRHIxF0uYkT+8IMP/DlO2HiuVpEeXRdm1ADUSfVA502vbzzWUt+I91/LyB0fGHMf8xlCe8RrPWlbj2w==} - engines: {node: '>=24.11.0'} + '@concertypin/config@0.5.0': + resolution: {integrity: sha512-VV9rvZDGOnXZ7Ma8CveC3uP6Ipng3JCMpBiubCF4QyslY7/D5/98HRd2USxgJujBv7xph17mMBty9q4lBnD2ww==} + engines: {node: '>=26'} peerDependencies: oxfmt: '>=0.62.0 <1' - oxlint: '>=1.47.0 <2' + oxlint: '>=1.87.0 <2' + oxlint-tsgolint: 7.0.2003 + peerDependenciesMeta: + oxlint-tsgolint: + optional: true '@csstools/color-helpers@6.1.2': resolution: {integrity: sha512-grhRy3OKmniaAEKXMjua5z/EODX0MSqBGjunw8+j/3HQjOnahs2AGhvEOIYVUWcU6ScApbhLhVrQTX8XqrMrow==} @@ -1545,10 +1549,12 @@ snapshots: dependencies: css-tree: 3.2.1 - '@concertypin/config@0.4.0(oxfmt@0.72.0)(oxlint@1.87.0(oxlint-tsgolint@7.0.2003))': + '@concertypin/config@0.5.0(oxfmt@0.72.0)(oxlint-tsgolint@7.0.2003)(oxlint@1.87.0(oxlint-tsgolint@7.0.2003))': dependencies: oxfmt: 0.72.0 oxlint: 1.87.0(oxlint-tsgolint@7.0.2003) + optionalDependencies: + oxlint-tsgolint: 7.0.2003 '@csstools/color-helpers@6.1.2': {}