Merge branch 'main' into feat-support-overrides-in-buildfromoxlintconfig

oxc-project · Nov 28, 2024 · 10ed50a · 10ed50a
2 parents 52c02c8 + 20c61d1
commit 10ed50a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -17,7 +17,7 @@ jobs:
       - uses: ./.github/actions/pnpm
 
       - name: Run oxlint
-        run: npx oxlint --config=oxlint.json --tsconfig=tsconfig.json
+        run: npx oxlint --tsconfig=tsconfig.json
 
       - name: Run eslint
         run: npx eslint --flag unstable_ts_config
diff --git a/oxlint.json → .oxlintrc.json b/oxlint.json → .oxlintrc.json
diff --git a/package.json b/package.json
@@ -41,7 +41,7 @@
     "generate": "node --import @oxc-node/core/register ./scripts/generate.ts",
     "clone": "node --import @oxc-node/core/register ./scripts/sparse-clone.ts",
     "build": "vite build",
-    "lint": "npx oxlint --config=oxlint.json --tsconfig=tsconfig.json && npx eslint --flag unstable_ts_config",
+    "lint": "npx oxlint --tsconfig=tsconfig.json && npx eslint --flag unstable_ts_config",
     "format": "npx prettier --write .",
     "test": "vitest --reporter=verbose"
   },