Skip to content

Commit

Permalink
Merge branch 'main' into ci-check-code-generation
Browse files Browse the repository at this point in the history
  • Loading branch information
Sysix authored Nov 11, 2024
2 parents 6c05641 + 4769da9 commit cf20290
Show file tree
Hide file tree
Showing 22 changed files with 788 additions and 581 deletions.
2 changes: 1 addition & 1 deletion .mise.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[tools]
pnpm = "9.12.2"
pnpm = "9.12.3"
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,21 +53,21 @@ If you are using flat configuration (eslint >= 9.0), you can use the following c

```js
// eslint.config.js
import { buildFromOxlintConfigFile } from 'eslint-plugin-oxlint';
import oxlint from 'eslint-plugin-oxlint';
export default [
..., // other plugins
...buildFromOxlintConfigFile('./oxlint.json'),
...oxlint.buildFromOxlintConfigFile('./oxlint.json'),
];
```

Or build it by an `oxlint.json`-like object:

```js
// eslint.config.js
import { buildFromOxlintConfig } from 'eslint-plugin-oxlint';
import oxlint from 'eslint-plugin-oxlint';
export default [
..., // other plugins
...buildFromOxlintConfig({
...oxlint.buildFromOxlintConfig({
categories: {
correctness: 'warn'
},
Expand Down
4 changes: 2 additions & 2 deletions eslint.config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { buildFromOxlintConfigFile } from './src/index.js';
import oxlint from './src/index.js';
import unicorn from 'eslint-plugin-unicorn';
import eslint from '@eslint/js';
import eslintConfigPrettier from 'eslint-config-prettier';
Expand All @@ -12,5 +12,5 @@ export default [
unicorn.configs['flat/recommended'],
...tseslint.configs.recommended,
eslintConfigPrettier,
...buildFromOxlintConfigFile('oxlint.json'),
...oxlint.buildFromOxlintConfigFile('oxlint.json'),
];
23 changes: 12 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{
"name": "eslint-plugin-oxlint",
"version": "0.10.1",
"version": "0.11.1",
"description": "Turn off all rules already supported by oxlint",
"type": "module",
"packageManager": "[email protected]",
"types": "./dist/index.d.ts",
"packageManager": "[email protected]",
"exports": {
".": {
"types": "./dist/index.d.ts",
Expand All @@ -12,16 +13,16 @@
"default": "./dist/index.mjs"
},
"./rules-by-category": {
"types": "./dist/rules-by-category.d.ts",
"import": "./dist/rules-by-category.mjs",
"require": "./dist/rules-by-category.cjs",
"default": "./dist/rules-by-category.mjs"
"types": "./dist/generated/rules-by-category.d.ts",
"import": "./dist/generated/rules-by-category.mjs",
"require": "./dist/generated/rules-by-category.cjs",
"default": "./dist/generated/rules-by-category.mjs"
},
"./rules-by-scope": {
"types": "./dist/rules-by-scope.d.ts",
"import": "./dist/rules-by-scope.mjs",
"require": "./dist/rules-by-scope.cjs",
"default": "./dist/rules-by-scope.mjs"
"types": "./dist/generated/rules-by-scope.d.ts",
"import": "./dist/generated/rules-by-scope.mjs",
"require": "./dist/generated/rules-by-scope.cjs",
"default": "./dist/generated/rules-by-scope.mjs"
}
},
"files": [
Expand Down Expand Up @@ -63,7 +64,7 @@
"husky": "^9.1.6",
"lint-staged": "^15.2.10",
"memfs": "^4.14.0",
"oxlint": "^0.10.1",
"oxlint": "^0.11.1",
"prettier": "^3.3.3",
"scule": "^1.3.0",
"shelljs": "^0.8.5",
Expand Down
Loading

0 comments on commit cf20290

Please sign in to comment.