Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
node_modules
package-lock.json
5 changes: 2 additions & 3 deletions configs/javascript.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { fixupPluginRules } from '@eslint/compat';
import stylisticEslint from '@stylistic/eslint-plugin';
import _import from 'eslint-plugin-import';

Expand Down Expand Up @@ -76,8 +75,8 @@ const jsRules = {

export default {
plugins: {
'@stylistic': fixupPluginRules(stylisticEslint),
import: fixupPluginRules(_import),
'@stylistic': stylisticEslint,
import: _import,
},
settings: {
/** @see https://github.com/import-js/eslint-plugin-import/issues/2556#issuecomment-1419518561 */
Expand Down
24 changes: 3 additions & 21 deletions configs/recommended.js
Original file line number Diff line number Diff line change
@@ -1,29 +1,11 @@
import path from 'node:path';
import { fileURLToPath } from 'node:url';
import { fixupConfigRules } from '@eslint/compat';
import { FlatCompat } from '@eslint/eslintrc';
import js from '@eslint/js';
import typescriptEslint from '@typescript-eslint/eslint-plugin';
import javascript from './javascript.js';
import typescript from './typescript.js';

const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);
const compat = new FlatCompat({
baseDirectory: __dirname,
recommendedConfig: js.configs.recommended,
allConfig: js.configs.all,
});

export default [
...fixupConfigRules(compat.extends(
'eslint:recommended',
'plugin:@typescript-eslint/recommended',
// TODO: 有効にすると .ts ファイルで import したときに
// parserPath or languageOptions.parser is required!
// と出るので以下を無効化しておく
// 'plugin:import/recommended',
'plugin:import/typescript',
)),
js.configs.recommended,
...typescriptEslint.configs['flat/recommended'],
{
files: ['**/*.js', '**/*.cjs', '**/*.mjs', '**/*.jsx'],
...javascript,
Expand Down
7 changes: 3 additions & 4 deletions configs/typescript.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import typescriptEslint from '@typescript-eslint/eslint-plugin';
import stylisticEslint from '@stylistic/eslint-plugin';
import tsParser from '@typescript-eslint/parser';
import { fixupPluginRules } from '@eslint/compat';
import _import from 'eslint-plugin-import';
import javascript from './javascript.js';

Expand Down Expand Up @@ -47,9 +46,9 @@ const tsRules = {

export default {
plugins: {
'@typescript-eslint': fixupPluginRules(typescriptEslint),
'@stylistic': fixupPluginRules(stylisticEslint),
import: fixupPluginRules(_import),
'@typescript-eslint': typescriptEslint,
'@stylistic': stylisticEslint,
import: _import,
},
languageOptions: {
parser: tsParser,
Expand Down
2 changes: 0 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
"misskey"
],
"peerDependencies": {
"@eslint/compat": ">= 1",
"@eslint/js": ">= 9",
"@stylistic/eslint-plugin": ">= 5",
"@typescript-eslint/eslint-plugin": ">= 8",
Expand All @@ -31,7 +30,6 @@
"globals": ">= 16"
},
"devDependencies": {
"@eslint/compat": "^1.4.1",
"@eslint/js": "^9.39.0",
"@stylistic/eslint-plugin": "^5.5.0",
"@types/node": "^24.9.2",
Expand Down
18 changes: 0 additions & 18 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.